mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-06 06:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Logs can now be sent to files or syslog in addition to stderr

Browse source
This commit is contained in:
Frank Denis 2018-01-18 14:25:45 +01:00
parent b0f6a04dc4
commit 0a63975d48
14 changed files with 518 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

61
vendor/github.com/jedisct1/dlog/dlog.go generated vendored
View file

@ -9,14 +9,21 @@ import (
"sync"
"sync/atomic"
"time"
"github.com/hashicorp/go-syslog"
)
type Severity int32
type globals struct {
sync.Mutex
logLevel Severity
appName string
logLevel Severity
useSyslog *bool
appName string
syslogFacility string
syslogger *gsyslog.Syslogger
fileName *string
outFd *os.File
}
var (
@ -47,6 +54,16 @@ var SeverityName = []string{
SeverityFatal: "FATAL",
}
var severityToSyslogPriority = []gsyslog.Priority{
SeverityDebug: gsyslog.LOG_DEBUG,
SeverityInfo: gsyslog.LOG_INFO,
SeverityNotice: gsyslog.LOG_NOTICE,
SeverityWarning: gsyslog.LOG_WARNING,
SeverityError: gsyslog.LOG_ERR,
SeverityCritical: gsyslog.LOG_CRIT,
SeverityFatal: gsyslog.LOG_ALERT,
}
func Debugf(format string, args ...interface{}) {
logf(SeverityDebug, format, args...)
}
@ -125,9 +142,18 @@ func (s *Severity) Set(strVal string) error {
return nil
}
func Init(appName string, logLevel Severity) {
func Init(appName string, logLevel Severity, syslogFacility string) error {
_globals.logLevel.set(logLevel)
if len(syslogFacility) == 0 {
syslogFacility = "DAEMON"
}
_globals.appName = appName
_globals.syslogFacility = syslogFacility
_globals.useSyslog = flag.Bool("syslog", false, "Send logs to the local system logger")
_globals.fileName = flag.String("logfile", "", "Write logs to file")
flag.Var(&_globals.logLevel, "loglevel", fmt.Sprintf("Log level (%d-%d)", SeverityDebug, SeverityFatal))
return nil
}
func logf(severity Severity, format string, args ...interface{}) {
@ -142,10 +168,33 @@ func logf(severity Severity, format string, args ...interface{}) {
if len(message) <= 0 {
return
}
line := fmt.Sprintf("[%d-%02d-%02d %02d:%02d:%02d] [%s] [%s] %s\n", year, int(month), day, hour, minute, second, _globals.appName, SeverityName[severity], message)
_globals.Lock()
os.Stderr.WriteString(line)
_globals.Unlock()
defer _globals.Unlock()
if *_globals.useSyslog && _globals.syslogger == nil {
syslogger, err := gsyslog.NewLogger(gsyslog.LOG_INFO, _globals.syslogFacility, _globals.appName)
if err != nil {
panic(err)
}
_globals.syslogger = &syslogger
}
if _globals.fileName != nil && len(*_globals.fileName) > 0 && _globals.outFd == nil {
outFd, err := os.OpenFile(*_globals.fileName, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
panic(err)
}
_globals.outFd = outFd
}
if _globals.syslogger != nil {
(*_globals.syslogger).WriteLevel(severityToSyslogPriority[severity], []byte(message))
} else {
line := fmt.Sprintf("[%d-%02d-%02d %02d:%02d:%02d] [%s] [%s] %s\n", year, int(month), day, hour, minute, second, _globals.appName, SeverityName[severity], message)
if _globals.outFd != nil {
_globals.outFd.WriteString(line)
_globals.outFd.Sync()
} else {
os.Stderr.WriteString(line)
}
}
if severity >= SeverityFatal {
os.Exit(255)
}