add teelogger
This commit is contained in:
parent
d3884d9074
commit
9facb2c230
@ -5,19 +5,21 @@ package main
|
||||
import (
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"router7/internal/dhcp4"
|
||||
"router7/internal/notify"
|
||||
"router7/internal/teelogger"
|
||||
)
|
||||
|
||||
var log = teelogger.NewConsole()
|
||||
|
||||
func logic() error {
|
||||
const configPath = "/perm/dhcp4/wire/lease.json"
|
||||
if err := os.MkdirAll(filepath.Dir(configPath), 0755); err != nil {
|
||||
@ -35,9 +37,7 @@ func logic() error {
|
||||
log.Printf("Temporary error: %v", err)
|
||||
continue
|
||||
}
|
||||
// TODO: use a logger which writes to /dev/console
|
||||
log.Printf("lease: %+v", c.Config())
|
||||
ioutil.WriteFile("/dev/console", []byte(fmt.Sprintf("lease: %+v\n", c.Config())), 0600)
|
||||
b, err := json.Marshal(c.Config())
|
||||
if err != nil {
|
||||
return err
|
||||
@ -47,7 +47,6 @@ func logic() error {
|
||||
}
|
||||
if err := notify.Process("/user/netconfi", syscall.SIGUSR1); err != nil {
|
||||
log.Printf("notifying netconfig: %v", err)
|
||||
ioutil.WriteFile("/dev/console", []byte(fmt.Sprintf("notifying netconfigd: %+v\n", err)), 0600)
|
||||
}
|
||||
time.Sleep(time.Until(c.Config().RenewAfter))
|
||||
}
|
||||
|
20
internal/teelogger/teelogger.go
Normal file
20
internal/teelogger/teelogger.go
Normal file
@ -0,0 +1,20 @@
|
||||
// Package teelogger provides loggers which send their output to multiple
|
||||
// writers, like the tee(1) command.
|
||||
package teelogger
|
||||
|
||||
import (
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"os"
|
||||
)
|
||||
|
||||
// NewConsole returns a logger which returns to /dev/console and os.Stderr.
|
||||
func NewConsole() *log.Logger {
|
||||
var w io.Writer
|
||||
w, err := os.OpenFile("/dev/console", os.O_RDWR, 0600)
|
||||
if err != nil {
|
||||
w = ioutil.Discard
|
||||
}
|
||||
return log.New(io.MultiWriter(os.Stderr, w), "", log.LstdFlags|log.Lshortfile)
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user