From d658359240fd78973eb8798a3841cd3998ba01a9 Mon Sep 17 00:00:00 2001 From: Noah Petherbridge Date: Sun, 22 Dec 2019 18:34:31 -0800 Subject: [PATCH] Switch github.com/kirsle/golog to git.kirsle.net/go/log * New logger module supports js/wasm build by skipping the dependency on ssh/terminal (which detected interactive consoles, not applicable to JS). In WASM the logs go to the browser console and ANSI color codes not needed. --- pkg/doodle.go | 6 +++--- pkg/level/base_test.go | 8 -------- pkg/log/log.go | 18 +++++++++--------- wasm/README.md | 2 +- 4 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 pkg/level/base_test.go diff --git a/pkg/doodle.go b/pkg/doodle.go index 3ae8a03..e8f1257 100644 --- a/pkg/doodle.go +++ b/pkg/doodle.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "git.kirsle.net/go/render" - "git.kirsle.net/go/render/event" "git.kirsle.net/apps/doodle/pkg/balance" "git.kirsle.net/apps/doodle/pkg/branding" "git.kirsle.net/apps/doodle/pkg/enum" "git.kirsle.net/apps/doodle/pkg/log" "git.kirsle.net/apps/doodle/pkg/shmem" - "github.com/kirsle/golog" + golog "git.kirsle.net/go/log" + "git.kirsle.net/go/render" + "git.kirsle.net/go/render/event" ) const ( diff --git a/pkg/level/base_test.go b/pkg/level/base_test.go deleted file mode 100644 index ffcc26a..0000000 --- a/pkg/level/base_test.go +++ /dev/null @@ -1,8 +0,0 @@ -package level_test - -import "github.com/kirsle/golog" - -func init() { - log := golog.GetLogger("doodle") - log.Config.Level = golog.ErrorLevel -} diff --git a/pkg/log/log.go b/pkg/log/log.go index 349506c..1f34074 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -3,24 +3,24 @@ package log import ( "runtime" - "github.com/kirsle/golog" + "git.kirsle.net/go/log" ) -// Logger is the public golog.Logger object. -var Logger *golog.Logger +// Logger is the public log.Logger object. +var Logger *log.Logger func init() { - Logger = golog.GetLogger("doodle") - Logger.Configure(&golog.Config{ - Level: golog.InfoLevel, - Theme: golog.DarkTheme, - Colors: golog.ExtendedColor, + Logger = log.GetLogger("doodle") + Logger.Configure(&log.Config{ + Level: log.InfoLevel, + Theme: log.DarkTheme, + Colors: log.ExtendedColor, TimeFormat: "2006-01-02 15:04:05.000000", }) // TODO: Disable ANSI colors in logs on Windows. if runtime.GOOS == "windows" { - Logger.Config.Colors = golog.NoColor + Logger.Config.Colors = log.NoColor } } diff --git a/wasm/README.md b/wasm/README.md index 06a9427..ab37d00 100644 --- a/wasm/README.md +++ b/wasm/README.md @@ -35,7 +35,7 @@ serif in case of any problems. ## Known Bugs and Limitations -* github.com/kirsle/golog +* git.kirsle.net/go/log * The detection of an interactive terminal is broken in WASM. * `terminal.IsTerminal(int(os.Stdout.Fd()))` * As a workaround, comment it out and hardcode to `false`