TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

pkg/log: remove timestamp (#3218)

Browse source 
journald timestamps, kubernetes timestamps, syslog timestamps. It seems
silly to add our own timestamps to the logging output as these external
ones *also* do it. Only when just running coredns this might be weird.

Remove the timestamping from pkg/log.

Remove test that tested for this.

Fixes: #3211

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2019-08-28 14:41:11 +01:00 • committed by Chris O'Haver
parent 4fca3b0fb0
commit 6fdf130b67
2 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugin/pkg/log/log.go
View file

@ -14,7 +14,6 @@ import (
golog "log" golog "log"
"os" "os"
"sync" "sync"
"time"
) )
// D controls whether we should output debug logs. If true, we do, once set // D controls whether we should output debug logs. If true, we do, once set
@ -41,17 +40,14 @@ func (d *d) Value() bool {
return b return b
} }
// RFC3339Milli doesn't exist, invent it here.
func clock() string { return time.Now().Format("2006-01-02T15:04:05.000Z07:00") }
// logf calls log.Printf prefixed with level. // logf calls log.Printf prefixed with level.
func logf(level, format string, v ...interface{}) { func logf(level, format string, v ...interface{}) {
golog.Print(clock(), level, fmt.Sprintf(format, v...)) golog.Print(level, fmt.Sprintf(format, v...))
} }
// log calls log.Print prefixed with level. // log calls log.Print prefixed with level.
func log(level string, v ...interface{}) { func log(level string, v ...interface{}) {
golog.Print(clock(), level, fmt.Sprint(v...)) golog.Print(level, fmt.Sprint(v...))
} }
// Debug is equivalent to log.Print(), but prefixed with "[DEBUG] ". It only outputs something // Debug is equivalent to log.Print(), but prefixed with "[DEBUG] ". It only outputs something
@ -102,9 +98,9 @@ func Fatalf(format string, v ...interface{}) { logf(fatal, format, v...); os.Exi
func Discard() { golog.SetOutput(ioutil.Discard) } func Discard() { golog.SetOutput(ioutil.Discard) }
const ( const (
debug = " [DEBUG] " debug = "[DEBUG] "
err = " [ERROR] " err = "[ERROR] "
fatal = " [FATAL] " fatal = "[FATAL] "
info = " [INFO] " info = "[INFO] "
warning = " [WARNING] " warning = "[WARNING] "
) )

16
plugin/pkg/log/plugin_test.go
View file

@ -19,19 +19,3 @@ func TestPlugins(t *testing.T) {
t.Errorf("Expected log to be %s, got %s", info+ts, x) t.Errorf("Expected log to be %s, got %s", info+ts, x)
} }
} }
func TestPluginsDateTime(t *testing.T) {
var f bytes.Buffer
const ts = "test"
golog.SetFlags(0) // Set to 0 because we're doing our own time, with timezone
golog.SetOutput(&f)
lg := NewWithPlugin("testplugin")
lg.Info(ts)
// rude check if the date/time is there
str := f.String()
if str[4] != '-' || str[7] != '-' || str[10] != 'T' {
t.Errorf("Expected date got %s...", str[:15])
}
}