dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log.default not added until go 1.16

This commit is contained in:
Ted Unangst 2022-02-06 13:30:53 -05:00
parent 90fc23212b
commit d3ce3cc201
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
log.go
View File

@ -23,9 +23,14 @@ import (
"os" "os"
) )
var elog = log.Default() // log.Default() not added until go 1.16
var ilog = log.Default() func logdefault() *log.Logger {
var dlog = log.Default() return log.New(os.Stderr, os.Args[0], log.LstdFlags)
}
var elog = logdefault()
var ilog = logdefault()
var dlog = logdefault()
var elogname, ilogname, dlogname, alllogname string var elogname, ilogname, dlogname, alllogname string
@ -45,7 +50,7 @@ func initLogging(elogname, ilogname, dlogname string) {
func openlog(name string, prio syslog.Priority) *log.Logger { func openlog(name string, prio syslog.Priority) *log.Logger {
if name == "stderr" { if name == "stderr" {
return log.Default() return log.New(os.Stderr, os.Args[0], log.LstdFlags)
} }
if name == "stdout" { if name == "stdout" {
return log.New(os.Stdout, os.Args[0], log.LstdFlags) return log.New(os.Stdout, os.Args[0], log.LstdFlags)
@ -57,14 +62,14 @@ func openlog(name string, prio syslog.Priority) *log.Logger {
logger, err := syslog.NewLogger(syslog.LOG_UUCP|prio, 0) logger, err := syslog.NewLogger(syslog.LOG_UUCP|prio, 0)
if err != nil { if err != nil {
elog.Printf("can't create syslog: %s", err) elog.Printf("can't create syslog: %s", err)
return log.Default() return logdefault()
} }
return logger return logger
} }
fd, err := os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600) fd, err := os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600)
if err != nil { if err != nil {
elog.Printf("can't open log file %s: %s", name, err) elog.Printf("can't open log file %s: %s", name, err)
return log.Default() return logdefault()
} }
logger := log.New(fd, os.Args[0], log.LstdFlags) logger := log.New(fd, os.Args[0], log.LstdFlags)
logger.Printf("new log started") logger.Printf("new log started")