From 8de70bc183fd6e12682ea7e71bd3e4ecd4e403bb Mon Sep 17 00:00:00 2001 From: Kevin Tang <73975146+vt128@users.noreply.github.com> Date: Mon, 22 Jun 2026 14:46:05 +0800 Subject: [PATCH] [chore] streamline logging and terminal setup Build the console and no-op loggers directly with zap instead of a thin wrapper, enable Windows ANSI handling via golang.org/x/sys/windows (already in the dependency tree), and use the standard library for the blank-string and OS checks plus a small inline colorizer for the version banner. No change to CLI behaviour; go.mod is tidied accordingly. --- ansi_other.go | 7 +++++++ ansi_windows.go | 20 ++++++++++++++++++++ cli/box.go | 4 ++-- cli/dispatch.go | 4 ++-- cli/run.go | 6 +++--- cli/z_log.go | 3 +-- config/build.go | 30 +++++++++++++++--------------- go.mod | 11 +++-------- go.sum | 44 -------------------------------------------- main.go | 29 +++++++++++++++++++++-------- module/sys/z_log.go | 3 +-- web/z_log.go | 3 +-- 12 files changed, 76 insertions(+), 88 deletions(-) create mode 100644 ansi_other.go create mode 100644 ansi_windows.go diff --git a/ansi_other.go b/ansi_other.go new file mode 100644 index 0000000..353f74d --- /dev/null +++ b/ansi_other.go @@ -0,0 +1,7 @@ +//go:build !windows + +package main + +// enableANSIControl is a no-op on non-Windows platforms, where terminals already +// understand ANSI escape sequences. +func enableANSIControl() {} diff --git a/ansi_windows.go b/ansi_windows.go new file mode 100644 index 0000000..cd8aad3 --- /dev/null +++ b/ansi_windows.go @@ -0,0 +1,20 @@ +//go:build windows + +package main + +import ( + "os" + + "golang.org/x/sys/windows" +) + +// enableANSIControl turns on virtual-terminal processing for stdout so ANSI +// escape sequences (colours, cursor control) render on Windows consoles. +func enableANSIControl() { + stdout := windows.Handle(os.Stdout.Fd()) + var mode uint32 + if err := windows.GetConsoleMode(stdout, &mode); err != nil { + return + } + _ = windows.SetConsoleMode(stdout, mode|windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING) +} diff --git a/cli/box.go b/cli/box.go index e822a2d..cf5c8f0 100644 --- a/cli/box.go +++ b/cli/box.go @@ -4,9 +4,9 @@ import ( "fmt" "os" "path/filepath" + "strings" "sync" - "github.com/1set/gut/ystring" "github.com/1set/starbox" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -77,7 +77,7 @@ func BuildBox(opts *BoxOpts) (*starbox.Starbox, error) { box.SetLogger(lg) } - if ystring.IsNotBlank(opts.includePath) { + if strings.TrimSpace(opts.includePath) != "" { box.SetFS(os.DirFS(opts.includePath)) } diff --git a/cli/dispatch.go b/cli/dispatch.go index 42e9dde..9eff702 100644 --- a/cli/dispatch.go +++ b/cli/dispatch.go @@ -3,8 +3,8 @@ package cli import ( "fmt" "os" + "strings" - "github.com/1set/gut/ystring" "github.com/1set/starbox" "github.com/1set/starcli/util" ) @@ -37,7 +37,7 @@ func Process(args *Args) int { // for basic checks numArg := args.NumberOfArgs - useDirectCode := ystring.IsNotBlank(args.CodeContent) + useDirectCode := strings.TrimSpace(args.CodeContent) != "" // determine action var action func(*Args) error diff --git a/cli/run.go b/cli/run.go index 25fbbb8..c9d4efb 100644 --- a/cli/run.go +++ b/cli/run.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "os" "path/filepath" + "strings" - "github.com/1set/gut/ystring" "github.com/1set/starbox" "github.com/1set/starcli/config" "github.com/1set/starcli/util" @@ -23,7 +23,7 @@ func runWebServer(args *Args) error { runner = starbox.NewRunConfig() webPort = args.WebPort numArg = args.NumberOfArgs - useDirectCode = ystring.IsNotBlank(args.CodeContent) + useDirectCode = strings.TrimSpace(args.CodeContent) != "" ) // prepare runner @@ -134,7 +134,7 @@ func runCheck(args *Args) error { // resolve the script source: -c code, or the first file argument var name, script string switch { - case ystring.IsNotBlank(args.CodeContent): + case strings.TrimSpace(args.CodeContent) != "": name, script = "direct.star", args.CodeContent case args.NumberOfArgs >= 1: name = filepath.Base(args.Arguments[0]) diff --git a/cli/z_log.go b/cli/z_log.go index 2e58591..699812b 100644 --- a/cli/z_log.go +++ b/cli/z_log.go @@ -1,14 +1,13 @@ package cli import ( - "bitbucket.org/neiku/hlog" "go.uber.org/zap" ) var log *zap.SugaredLogger func init() { - log = hlog.NewNoopLogger().SugaredLogger + log = zap.NewNop().Sugar() } // SetLog sets the logger from outside the package. diff --git a/config/build.go b/config/build.go index d3a619f..a6c128a 100644 --- a/config/build.go +++ b/config/build.go @@ -3,11 +3,8 @@ package config import ( _ "embed" "fmt" + "runtime" "strings" - - cl "bitbucket.org/ai69/colorlogo" - "github.com/1set/gut/yos" - "github.com/1set/gut/ystring" ) // revive:disable:exported @@ -29,25 +26,18 @@ var ( // DisplayBuildInfo prints the build information to the console. func DisplayBuildInfo() { - // is on master - onMaster := GitBranch == "master" || GitBranch == "main" || GitBranch == "" - // write logo var sb strings.Builder - if onMaster { - sb.WriteString(cl.AnamnisarByColumn(logoArt)) - } else { - sb.WriteString(cl.OceanSandByColumn(logoArt)) - } - sb.WriteString(ystring.NewLine) + sb.WriteString(colorizeLogo(logoArt)) + sb.WriteString("\n") // inline helpers arrow := "✰ " - if yos.IsOnWindows() { + if runtime.GOOS == "windows" { arrow = "> " } addNonBlankField := func(name, value string) { - if ystring.IsNotBlank(value) { + if strings.TrimSpace(value) != "" { fmt.Fprintln(&sb, arrow+name+":", value) } } @@ -62,3 +52,13 @@ func DisplayBuildInfo() { fmt.Println(sb.String()) } + +// colorizeLogo renders the logo art with a per-line ANSI 256-colour gradient. +func colorizeLogo(art string) string { + palette := []int{45, 44, 43, 49, 48, 84, 78, 79} // teal → green gradient + var sb strings.Builder + for i, line := range strings.Split(strings.TrimRight(art, "\n"), "\n") { + fmt.Fprintf(&sb, "\x1b[38;5;%dm%s\x1b[0m\n", palette[i%len(palette)], line) + } + return sb.String() +} diff --git a/go.mod b/go.mod index 3602e1b..0cadb88 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,6 @@ module github.com/1set/starcli go 1.25.8 require ( - bitbucket.org/ai69/colorlogo v0.1.3 - bitbucket.org/neiku/hlog v0.1.2 - bitbucket.org/neiku/winornot v0.0.4 - github.com/1set/gut v0.0.0-20201117175203-a82363231997 github.com/1set/starbox v0.2.0 github.com/1set/starlet v0.2.2 github.com/kyokomi/emoji/v2 v2.2.13 @@ -30,16 +26,19 @@ require ( go.starlark.net v0.0.0-20260324133313-ffb3f39dd27a go.uber.org/atomic v1.11.0 go.uber.org/zap v1.24.0 + golang.org/x/sys v0.45.0 golang.org/x/term v0.31.0 ) require ( + bitbucket.org/ai69/colorlogo v0.1.3 // indirect bitbucket.org/creachadair/shell v0.0.8 // indirect charm.land/bubbles/v2 v2.0.0 // indirect charm.land/bubbletea/v2 v2.0.2 // indirect charm.land/glamour/v2 v2.0.1 // indirect charm.land/huh/v2 v2.0.3 // indirect charm.land/lipgloss/v2 v2.0.4 // indirect + github.com/1set/gut v0.0.0-20201117175203-a82363231997 // indirect github.com/1set/starlight v0.2.0 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect @@ -74,7 +73,6 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.14.0 // indirect github.com/goccy/go-json v0.10.2 // indirect - github.com/gonutz/w32 v1.0.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/h2so5/here v0.0.0-20200815043652-5e14eb691fae // indirect @@ -104,7 +102,6 @@ require ( github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/resend/resend-go/v2 v2.11.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/rodolfoag/gow32 v0.0.0-20160917004320-d95ff468acf8 // indirect github.com/sahilm/fuzzy v0.1.1 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/sashabaranov/go-openai v1.41.2 // indirect @@ -126,12 +123,10 @@ require ( golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect golang.org/x/net v0.39.0 // indirect golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.45.0 // indirect golang.org/x/text v0.24.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect diff --git a/go.sum b/go.sum index a4fbcc2..6e15132 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,6 @@ bitbucket.org/ai69/colorlogo v0.1.3 h1:hVjnSsbzleQK9QwbEXbkw14Zt3dP1PUeAg41I62ek bitbucket.org/ai69/colorlogo v0.1.3/go.mod h1:opCygeOoMcE5aPB2AQenx2dEh6BgYD1WmmlJ3vbOTio= bitbucket.org/creachadair/shell v0.0.8 h1:3yM6JcAfaGWzjzcCamTblzSIWXm/YSs0PFGIzBm2HTo= bitbucket.org/creachadair/shell v0.0.8/go.mod h1:vINzudofoUXZSJ5tREgpy+Etyjsag3ait5WOWImEVZ0= -bitbucket.org/neiku/hlog v0.1.2 h1:6E3Hk81Q7Gp7Q7uMKJUhrJTzzs8ciSUMaTKc1LuUVE8= -bitbucket.org/neiku/hlog v0.1.2/go.mod h1:oEgNTj1NYXHX7PSlntW43/geboj4D6JlMMdkqCplsDU= -bitbucket.org/neiku/winornot v0.0.4 h1:I3XCWgA5DP93Cy4Mip5UmUlboymnFvb18q9UU7gl9lo= -bitbucket.org/neiku/winornot v0.0.4/go.mod h1:xzKlwxkpGIumHbxwUrB41kFIra8gz/ZZgJzltE3TArA= charm.land/bubbles/v2 v2.0.0 h1:tE3eK/pHjmtrDiRdoC9uGNLgpopOd8fjhEe31B/ai5s= charm.land/bubbles/v2 v2.0.0/go.mod h1:rCHoleP2XhU8um45NTuOWBPNVHxnkXKTiZqcclL/qOI= charm.land/bubbletea/v2 v2.0.2 h1:4CRtRnuZOdFDTWSff9r8QFt/9+z6Emubz3aDMnf/dx0= @@ -24,7 +20,6 @@ github.com/1set/starlet v0.2.2 h1:TWEbuY5O3291GvRwxHLMiJCSGWhI1ZMdXe+nCtBejW0= github.com/1set/starlet v0.2.2/go.mod h1:3Sz9ToVkumS1OMojGmb37iLqd69UVTr1PWFOXaiC+rA= github.com/1set/starlight v0.2.0 h1:W9yulJYANolyMLMOH0M4xcW8RQVpi68opSdNmoipcic= github.com/1set/starlight v0.2.0/go.mod h1:o9KiJBpy92daHyNHBUwS0nFIjjLxLM/XmRxAZf4FIaE= -github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= @@ -126,8 +121,6 @@ github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/gonutz/w32 v1.0.0 h1:3t1z6ZfkFvirjFYBx9pHeHBuKoN/VBVk9yHb/m2Ll/k= -github.com/gonutz/w32 v1.0.0/go.mod h1:Rc/YP5K9gv0FW4p6X9qL3E7Y56lfMflEol1fLElfMW4= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -151,7 +144,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -202,7 +194,6 @@ github.com/osteele/tuesday v1.0.3 h1:SrCmo6sWwSgnvs1bivmXLvD7Ko9+aJvvkmDjB5G4FTU github.com/osteele/tuesday v1.0.3/go.mod h1:pREKpE+L03UFuR+hiznj3q7j3qB1rUZ4XfKejwWFF2M= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -218,8 +209,6 @@ github.com/resend/resend-go/v2 v2.11.0/go.mod h1:ihnxc7wPpSgans8RV8d8dIF4hYWVsqM github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rodolfoag/gow32 v0.0.0-20160917004320-d95ff468acf8 h1:p7tJTb+Rqvp8dS82oMnL1M1Yt9ersQyJU7E1C8Bl+7Q= -github.com/rodolfoag/gow32 v0.0.0-20160917004320-d95ff468acf8/go.mod h1:w/ebPUfAcyZMYjstwPIWTEGSahChHx5R3Y+xElrvxDc= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA= @@ -295,86 +284,53 @@ github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4d github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE= github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs= github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA= go.starlark.net v0.0.0-20260324133313-ffb3f39dd27a h1:w7OMj6r/AoxBpbfncRXaV18hjzIAFRytYaRILymmMRE= go.starlark.net v0.0.0-20260324133313-ffb3f39dd27a/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index d4eed8f..40128d2 100644 --- a/main.go +++ b/main.go @@ -9,14 +9,13 @@ import ( // ("runs anywhere") instead of depending on host tz data. _ "time/tzdata" - "bitbucket.org/neiku/hlog" - "bitbucket.org/neiku/winornot" "github.com/1set/starcli/cli" "github.com/1set/starcli/config" "github.com/1set/starcli/module/sys" "github.com/1set/starcli/web" "github.com/spf13/viper" "go.uber.org/zap" + "go.uber.org/zap/zapcore" ) var ( @@ -25,7 +24,7 @@ var ( func init() { // fix for Windows terminal output - winornot.EnableANSIControl() + enableANSIControl() } func main() { @@ -46,12 +45,26 @@ func main() { } func initLogger(level string) { - // build root logger - lg := hlog.NewSimpleLogger() - if err := lg.SetLevelString(level); err != nil { - lg.Error(err) + // build the root console logger (stderr), keeping diagnostics off stdout + lvl := zapcore.InfoLevel + if err := lvl.Set(level); err != nil { + lvl = zapcore.InfoLevel } - log = lg.SugaredLogger.With(zap.Int("pid", os.Getpid())) + encCfg := zapcore.EncoderConfig{ + TimeKey: "ts", + LevelKey: "level", + NameKey: "logger", + CallerKey: "caller", + MessageKey: "msg", + StacktraceKey: "stacktrace", + LineEnding: zapcore.DefaultLineEnding, + EncodeLevel: zapcore.CapitalColorLevelEncoder, + EncodeTime: zapcore.ISO8601TimeEncoder, + EncodeDuration: zapcore.StringDurationEncoder, + EncodeCaller: zapcore.ShortCallerEncoder, + } + core := zapcore.NewCore(zapcore.NewConsoleEncoder(encCfg), zapcore.Lock(os.Stderr), lvl) + log = zap.New(core).Sugar().With(zap.Int("pid", os.Getpid())) // set log for sub-packages cli.SetLog(log) diff --git a/module/sys/z_log.go b/module/sys/z_log.go index 40d33a9..38dfb66 100644 --- a/module/sys/z_log.go +++ b/module/sys/z_log.go @@ -1,14 +1,13 @@ package sys import ( - "bitbucket.org/neiku/hlog" "go.uber.org/zap" ) var log *zap.SugaredLogger func init() { - log = hlog.NewNoopLogger().SugaredLogger + log = zap.NewNop().Sugar() } // SetLog sets the logger from outside the package. diff --git a/web/z_log.go b/web/z_log.go index cd4ff71..d16f100 100644 --- a/web/z_log.go +++ b/web/z_log.go @@ -1,14 +1,13 @@ package web import ( - "bitbucket.org/neiku/hlog" "go.uber.org/zap" ) var log *zap.SugaredLogger func init() { - log = hlog.NewNoopLogger().SugaredLogger + log = zap.NewNop().Sugar() } // SetLog sets the logger from outside the package.