summaryrefslogtreecommitdiff
path: root/internal/tlog
diff options
context:
space:
mode:
authorJakob Unterwurzacher2018-02-28 09:02:18 +0100
committerJakob Unterwurzacher2018-02-28 09:02:18 +0100
commitb96e3ee2717531e842c492c3a6799d1d0c3e51cb (patch)
tree3597324345ac4189c833b968465f07910dcbc534 /internal/tlog
parentac8f8bf4328d6d5c346004c7c0ef8e651aeaef93 (diff)
tlog: stop embedding log.Logger to prevent mistakes
A few places have called tlog.Warn.Print, which directly calls into log.Logger due to embedding, losing all features of tlog. Stop embedding log.Logger to make sure the internal functions cannot be called accidentially and fix (several!) instances that did.
Diffstat (limited to 'internal/tlog')
-rw-r--r--internal/tlog/log.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/tlog/log.go b/internal/tlog/log.go
index 720bb88..f6c0acf 100644
--- a/internal/tlog/log.go
+++ b/internal/tlog/log.go
@@ -53,7 +53,7 @@ type toggledLogger struct {
prefix string
postfix string
- *log.Logger
+ Logger *log.Logger
}
func (l *toggledLogger) Printf(format string, v ...interface{}) {
@@ -125,7 +125,7 @@ func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) {
if err != nil {
Warn.Printf("SwitchToSyslog: %v", err)
} else {
- l.SetOutput(w)
+ l.Logger.SetOutput(w)
}
}