From 1f551d633d6ece31d2db204348cfd6c619156e8c Mon Sep 17 00:00:00 2001 From: Hedzr Yeh Date: Wed, 9 Oct 2024 18:50:19 +0800 Subject: [PATCH] update all assert/debug info headers --- cli/atoa/stringtoany.go | 4 ++-- cli/command.go | 44 ++++++++++++++++++++--------------------- cli/examples/more.go | 6 +++--- cli/worker/exec.go | 12 +++++------ cli/worker/parse.go | 14 ++++++------- cli/worker/pre.go | 18 ++++++++--------- cli/worker/pre_test.go | 18 ++++++++--------- cli/worker/printer.go | 6 +++--- cli/worker/shows.go | 2 +- cli/worker/worker.go | 6 +++--- cmdr.go | 2 +- internal/tool/dirs.go | 10 +++++----- 12 files changed, 71 insertions(+), 71 deletions(-) diff --git a/cli/atoa/stringtoany.go b/cli/atoa/stringtoany.go index 713b475..3e3cbc5 100644 --- a/cli/atoa/stringtoany.go +++ b/cli/atoa/stringtoany.go @@ -105,7 +105,7 @@ func (s *toS) parseImpl(str string, rt reflect.Type, meme any) (v any, err error if rt.Kind() == reflect.Pointer { rt = rt.Elem() //nolint:revive rv := reflect.New(rt) - logz.Info("rv", "rv", ref.Valfmt(&rv)) + logz.Debug("[cmdr] toS.parseImpl - rv", "rv", ref.Valfmt(&rv)) err = rv.Interface().(encoding.TextUnmarshaler).UnmarshalText([]byte(str)) if err == nil { v = rv.Interface() @@ -201,7 +201,7 @@ func (s *toS) parseArray(preferKind reflect.Kind, typArray reflect.Type, str str var pos, position int position, v, err = s.stepComplexObject(preferKind, typArray, runes, pos, meme) if position == pos || position < len(runes) { - logz.Warn("the given string is empty or has too much data?", "str", str, "posAfterParsed", position) + logz.Warn("[cmdr] the given string is empty or has too much data?", "str", str, "posAfterParsed", position) } return } diff --git a/cli/command.go b/cli/command.go index 191f32b..3d8ac6f 100644 --- a/cli/command.go +++ b/cli/command.go @@ -245,7 +245,7 @@ func (c *Command) getDeferAction(cmd *Command, args []string) func(errInvoked er } if !ecp.IsEmpty() { - logz.Fatal("Error(s) occurred when running post-actions:", "error", ecp.Error()) + logz.Fatal("[cmdr] Error(s) occurred when running post-actions:", "error", ecp.Error()) } } } @@ -263,7 +263,7 @@ func (c *Command) getDeferAction(cmd *Command, args []string) func(errInvoked er // ecp.Attach(c.postInvoke(cmd, args, errInvoked)) // } // if !ecp.IsEmpty() { -// logz.Fatalf("Error(s) occurred when running post-actions: %v", ecp) +// logz.Fatalf("[cmdr] Error(s) occurred when running post-actions: %v", ecp) // } // return // } @@ -346,7 +346,7 @@ func (c *Command) ensureXrefFlags() { //nolint:revive ff.ensureXref() if ff.headLike { if ff.owner.headLikeFlag != nil && ff.owner.headLikeFlag != ff { - logz.Warn("too much head-like flags", "last-head-like-flag", ff.owner.headLikeFlag, "this-one", ff) + logz.Warn("[cmdr] too much head-like flags", "last-head-like-flag", ff.owner.headLikeFlag, "this-one", ff) } ff.owner.headLikeFlag = ff } @@ -362,7 +362,7 @@ func (c *Command) ensureXrefFlags() { //nolint:revive ff.ensureXref() if ff.headLike { if ff.owner.headLikeFlag != nil && ff.owner.headLikeFlag != ff { - logz.Warn("too much head-like flags", "last-head-like-flag", ff.owner.headLikeFlag, "this-one", ff) + logz.Warn("[cmdr] too much head-like flags", "last-head-like-flag", ff.owner.headLikeFlag, "this-one", ff) } ff.owner.headLikeFlag = ff } @@ -507,7 +507,7 @@ func (c *Command) MatchFlag(vp *FlagValuePkg) (ff *Flag, err error) { //nolint:r if num, err = strconv.ParseInt(vp.Remains, 0, 64); err == nil { vp.Matched, vp.Remains, ff = vp.Remains, "", c.headLikeFlag ff.defaultValue, vp.ValueOK = int(num), true // store the parsed value - logz.Verbose("headLike flag matched", "flg", ff, "num", num) + logz.Verbose("[cmdr] headLike flag matched", "flg", ff, "num", num) } } } else { @@ -771,7 +771,7 @@ func (c *Command) fromString(text string, meme any) (value any) { //nolint:reviv var err error value, err = atoa.Parse(text, meme) if err != nil { - logz.ErrorContext(context.TODO(), "cannot parse text to value", "err", err, "text", text, "target-value-meme", meme) + logz.ErrorContext(context.TODO(), "[cmdr] cannot parse text to value", "err", err, "text", text, "target-value-meme", meme) } return } @@ -798,31 +798,31 @@ func (c *Command) invokeExternalEditor(vp *FlagValuePkg, ff *Flag) *Flag { } } - logz.Debug("external editor", "ex-editor", ff.externalEditor) + logz.Debug("[cmdr] external editor", "ex-editor", ff.externalEditor) if cmd := os.Getenv(ff.externalEditor); cmd != "" { file := tool.TempFileName("message*.tmp", "message001.tmp", c.App().Name()) cmdS := tool.SplitCommandString(cmd) cmdS = append(cmdS, file) defer func(dst string) { if err := dir.DeleteFile(dst); err != nil { - logz.Error("cannot delete temporary file for flag", "flag", ff) + logz.Error("[cmdr] cannot delete temporary file for flag", "flag", ff) } }(file) - logz.Debug("invoke external editor", "ex-editor", ff.externalEditor, "cmd", cmdS) + logz.Debug("[cmdr] invoke external editor", "ex-editor", ff.externalEditor, "cmd", cmdS) if is.DebuggerAttached() { vp.ValueOK, vp.Value = true, "<>" - logz.Warn("use debug text", "flag", ff, "text", vp.Value) + logz.Warn("[cmdr] use debug text", "flag", ff, "text", vp.Value) return ff } if err := exec.CallSliceQuiet([]string{"which", cmdS[0]}, func(retCode int, stdoutText string) { if retCode == 0 { cmdS[0] = strings.TrimSpace(strings.TrimSuffix(stdoutText, "\n")) - logz.Debug("got external editor real-path", "cmd", cmdS) + logz.Debug("[cmdr] got external editor real-path", "cmd", cmdS) } }); err != nil { - logz.Error("cannot invoke which Command", "flag", ff, "cmd", cmdS) + logz.Error("[cmdr] cannot invoke which Command", "flag", ff, "cmd", cmdS) return nil } @@ -830,25 +830,25 @@ func (c *Command) invokeExternalEditor(vp *FlagValuePkg, ff *Flag) *Flag { var err error content, err = tool.LaunchEditorWithGetter(cmdS[0], func() string { return cmdS[1] }, false) if err != nil { - logz.Error("Error on launching cmd", "err", err, "cmd", cmdS) + logz.Error("[cmdr] Error on launching cmd", "err", err, "cmd", cmdS) return nil } // content, err = tool.LaunchEditorWith(cmdS[0], cmdS[1]) // if err != nil { - // logz.Error("Error on launching cmd", "err", err, "cmd", cmdS) + // logz.Error("[cmdr] Error on launching cmd", "err", err, "cmd", cmdS) // return nil // } // // content, err = tool.LaunchEditor(cmdS[0]) // if err != nil { - // logz.Error("Error on launching cmd", "err", err, "cmd", cmdS) + // logz.Error("[cmdr] Error on launching cmd", "err", err, "cmd", cmdS) // return nil // } // f, err = os.Open(file) // if err != nil { - // logz.Error("cannot open temporary file for reading content", "file", file, "flag", ff, "cmd", cmdS) + // logz.Error("[cmdr] cannot open temporary file for reading content", "file", file, "flag", ff, "cmd", cmdS) // return nil // } // defer f.Close() @@ -856,10 +856,10 @@ func (c *Command) invokeExternalEditor(vp *FlagValuePkg, ff *Flag) *Flag { vp.ValueOK, vp.Value = true, string(content) ff.defaultValue = string(content) - // logz.Debug("invoked external editor", "ex-editor", ff.externalEditor, "text", string(content)) + // logz.Debug("[cmdr] invoked external editor", "ex-editor", ff.externalEditor, "text", string(content)) return ff } - logz.Warn("Unknown External Editor for flag.", "ex-editor", ff.externalEditor, "flag", ff) + logz.Warn("[cmdr] Unknown External Editor for flag.", "ex-editor", ff.externalEditor, "flag", ff) return nil } @@ -1250,7 +1250,7 @@ func (c *Command) walkImpl(hist map[*Command]bool, cmd *Command, level int, cb W hist[cc] = true c.walkImpl(hist, cc, level+1, cb) } else { - logz.Warn("loop ref found", "dad", cmd, "cc", cc) + logz.Warn("[cmdr] loop ref found", "dad", cmd, "cc", cc) } } } @@ -1280,7 +1280,7 @@ func (c *Command) walkGroupedImpl(hist map[*Command]bool, dad, grandpa *Command, // cb(cc,nil, i, 0, level) c.walkGroupedImpl(hist, cc, dad, i, level+1, cb) } else { - logz.Warn("loop ref found", "dad", dad, "grandpa", grandpa, "cc", cc) + logz.Warn("[cmdr] loop ref found", "dad", dad, "grandpa", grandpa, "cc", cc) } } } @@ -1292,7 +1292,7 @@ func (c *Command) walkGroupedImpl(hist map[*Command]bool, dad, grandpa *Command, // // cb(cc,nil, i, 0, level) // c.walkGrouped(hist, cc, dad, level+1, cb) // } else { - // logz.Warn("loop ref found", "dad", dad, "grandpa", grandpa, "cc", cc) + // logz.Warn("[cmdr] loop ref found", "dad", dad, "grandpa", grandpa, "cc", cc) // } // } // } @@ -1334,7 +1334,7 @@ func (c *Command) walkEx(hist map[*Command]bool, dad, grandpa *Command, level, c // cb(cc,nil, i, 0, level) c.walkEx(hist, cc, dad, level+1, i, cb) } else { - logz.Warn("loop ref found", "dad", dad, "grandpa", grandpa, "cc", cc) + logz.Warn("[cmdr] loop ref found", "dad", dad, "grandpa", grandpa, "cc", cc) } } } diff --git a/cli/examples/more.go b/cli/examples/more.go index a664234..feb468c 100644 --- a/cli/examples/more.go +++ b/cli/examples/more.go @@ -463,12 +463,12 @@ func mxTest(cmd *cli.Command, args []string) (err error) { z := cmd.Set().MustString("app.test.deep.branch.1") fmt.Printf("*** Got app.test.deep.branch.1: %s\n", z) if z != "test" { - logz.Fatal("err, expect 'test', but got z", "z", z) + logz.Fatal("[cmdr] err, expect 'test', but got z", "z", z) } cmd.Set().Remove("app.test.deep.branch.1") if cmd.Set().Has("app.test.deep.branch.1") { - logz.Fatal("FAILED, expect key not found, but found a value associated with: ", "value", cmd.Set().MustR("app.test.deep.branch.1")) + logz.Fatal("[cmdr] FAILED, expect key not found, but found a value associated with: ", "value", cmd.Set().MustR("app.test.deep.branch.1")) } fmt.Printf("*** Got app.test.deep.branch.1 (after deleted): %s\n", cmd.Set().MustString("app.test.deep.branch.1")) @@ -498,7 +498,7 @@ func mxTest(cmd *cli.Command, args []string) (err error) { var data []byte data, err = dir.ReadAll(os.Stdin) if err != nil { - logz.Error("error:", "err", err) + logz.Error("[cmdr] error:", "err", err) return } fmt.Println("> The input contents are:") diff --git a/cli/worker/exec.go b/cli/worker/exec.go index 284440b..f1e2b2a 100644 --- a/cli/worker/exec.go +++ b/cli/worker/exec.go @@ -42,7 +42,7 @@ func (w *workerS) exec(ctx *parseCtx) (err error) { }() if !forceDefaultAction && lastCmd.HasOnAction() { - logz.Verbose("invoke action of cmd, with args", "cmd", lastCmd, "args", ctx.positionalArgs) + logz.Verbose("[cmdr] invoke action of cmd, with args", "cmd", lastCmd, "args", ctx.positionalArgs) err = lastCmd.Invoke(ctx.positionalArgs) if !w.errIsSignalFallback(err) { return @@ -53,7 +53,7 @@ func (w *workerS) exec(ctx *parseCtx) (err error) { handled, err1 := w.handleActions(ctx) // for k, action := range w.actions { // if k&w.actionsMatched != 0 { - // logz.Verbose("Invoking worker.actionsMatched", "hit-action", k, "actions", w.Actions()) + // logz.Verbose("[cmdr] Invoking worker.actionsMatched", "hit-action", k, "actions", w.Actions()) // err, handled = action(ctx, lastCmd), true // break // } @@ -73,7 +73,7 @@ func (w *workerS) exec(ctx *parseCtx) (err error) { return } - logz.Verbose("no onAction associate to cmd", "cmd", lastCmd) + logz.Verbose("[cmdr] no onAction associate to cmd", "cmd", lastCmd) err = w.onPrintHelpScreen(ctx, lastCmd) return } @@ -82,7 +82,7 @@ func (w *workerS) handleActions(ctx *parseCtx) (handled bool, err error) { lastCmd := ctx.LastCmd() for k, action := range w.actions { if k&w.actionsMatched != 0 { - logz.Verbose("Invoking worker.actionsMatched", "hit-action", k, "actions", w.Actions()) + logz.Verbose("[cmdr] Invoking worker.actionsMatched", "hit-action", k, "actions", w.Actions()) err, handled = action(ctx, lastCmd), true break } @@ -154,13 +154,13 @@ func (w *workerS) onSingleHyphenMatched(ctx *parseCtx) (err error) { //nolint:un } func (w *workerS) onUnknownCommandMatched(ctx *parseCtx) (err error) { - logz.Warn("UNKNOWN Command FOUND", "arg", ctx.arg) + logz.Warn("[cmdr] UNKNOWN Command FOUND", "arg", ctx.arg) err = cli.ErrUnmatchedCommand.FormatWith(ctx.arg, ctx.LastCmd()) return } func (w *workerS) onUnknownFlagMatched(ctx *parseCtx) (err error) { - logz.Warn("UNKNOWN Flag FOUND", "arg", ctx.arg) + logz.Warn("[cmdr] UNKNOWN Flag FOUND", "arg", ctx.arg) err = cli.ErrUnmatchedFlag.FormatWith(ctx.arg, ctx.LastCmd()) return } diff --git a/cli/worker/parse.go b/cli/worker/parse.go index 5693e59..f6c660d 100644 --- a/cli/worker/parse.go +++ b/cli/worker/parse.go @@ -28,7 +28,7 @@ func (w *workerS) parse(ctx *parseCtx) (err error) { //nolint:revive } }() - logz.Verbose("parsing command line args ...", "args", w.args) + logz.Verbose("[cmdr] parsing command line args ...", "args", w.args) loopArgs: for ctx.i = 1; ctx.i < len(w.args); ctx.i++ { @@ -38,11 +38,11 @@ loopArgs: if atomic.LoadInt32(&ctx.passThruMatched) > 0 || errorsv3.Is(err, cli.ErrShouldStop) || w.errIsUnmatchedArg(err) { ctx.positionalArgs = append(ctx.positionalArgs, w.args[ctx.i]) - logz.Verbose("positional args added", "i", ctx.i, "args", ctx.positionalArgs) + logz.Verbose("[cmdr] positional args added", "i", ctx.i, "args", ctx.positionalArgs) continue } - logz.Verbose("parsing command-line args", "i", ctx.i, "arg", w.args[ctx.i]) + logz.Verbose("[cmdr] parsing command-line args", "i", ctx.i, "arg", w.args[ctx.i]) ctx.arg, ctx.short, ctx.pos = w.args[ctx.i], false, 0 switch c1 := ctx.arg[0]; c1 { @@ -65,7 +65,7 @@ loopArgs: } // single '+': as a positional arg ctx.positionalArgs = append(ctx.positionalArgs, ctx.arg) - logz.Verbose("positional args added", "i", ctx.i, "args", ctx.positionalArgs) + logz.Verbose("[cmdr] positional args added", "i", ctx.i, "args", ctx.positionalArgs) continue case '-', '~': @@ -109,7 +109,7 @@ loopArgs: default: if ctx.NoCandidateChildCommands() { ctx.positionalArgs = append(ctx.positionalArgs, ctx.arg) - logz.Verbose("positional args added", "i", ctx.i, "args", ctx.positionalArgs) + logz.Verbose("[cmdr] positional args added", "i", ctx.i, "args", ctx.positionalArgs) continue } if err = w.matchCommand(ctx); !w.errIsSignalOrNil(err) { @@ -129,7 +129,7 @@ func (w *workerS) matchCommand(ctx *parseCtx) (err error) { if err == nil { ctx.lastCommand, err = len(ctx.matchedCommands)-1, nil } - logz.Verbose("command matched", "short", short, "cmd", ctx.LastCmd(), "handled", handled) + logz.Verbose("[cmdr] command matched", "short", short, "cmd", ctx.LastCmd(), "handled", handled) } return } @@ -144,7 +144,7 @@ compactFlags: if vp.Matched != "" && ff != nil && w.errIsSignalOrNil(err1) { ms, handled := ctx.addFlag(ff), false handled, err1 = ff.TryOnMatched(0, ms) - logz.Verbose("flag matched", "short", vp.Short, "flg", ff, "val-pkg-val", ff.DefaultValue(), "handled", handled) + logz.Verbose("[cmdr] flag matched", "short", vp.Short, "flg", ff, "val-pkg-val", ff.DefaultValue(), "handled", handled) ctx.i += vp.AteArgs vp.AteArgs = 0 diff --git a/cli/worker/pre.go b/cli/worker/pre.go index 35ad291..56f6de3 100644 --- a/cli/worker/pre.go +++ b/cli/worker/pre.go @@ -34,7 +34,7 @@ func (w *workerS) preProcess() (err error) { w.postEnvLoad() if is.VerboseBuild() || is.DebugBuild() { // `-tags delve` or `-tags verbose` used in building? - logz.Verbose("Dumping Store ...") + logz.Verbose("[cmdr] Dumping Store ...") logz.Verbose(w.Store().Dump()) } return @@ -55,12 +55,12 @@ func (w *workerS) preEnvSet() { _ = os.Setenv("APP_VER", w.Version()) _ = os.Setenv("APP_VERSION", w.Version()) - logz.Verbose("appName", "appName", w.Name(), "appVer", w.Version()) + logz.Verbose("[cmdr] preEnvSet()", "appName", w.Name(), "appVer", w.Version()) xdgPrefer := true if w.Store().Has("app.force-xdg-dir-prefer") { xdgPrefer = w.Store().MustBool("app.force-xdg-dir-prefer", false) - logz.Verbose("reset force-xdg-dir-prefer from store value", "app.force-xdg-dir-prefer", xdgPrefer) + logz.Verbose("[cmdr] reset force-xdg-dir-prefer from store value", "app.force-xdg-dir-prefer", xdgPrefer) } home := tool.HomeDir() @@ -102,14 +102,14 @@ func (w *workerS) preEnvSet() { } func (w *workerS) postEnvLoad() { - // logz.Info("env", "FORCE_DEFAULT_ACTION", os.Getenv("FORCE_DEFAULT_ACTION")) + // logz.Info("[cmdr] postEnvLoad()", "FORCE_DEFAULT_ACTION", os.Getenv("FORCE_DEFAULT_ACTION")) if w.Store().Has("app.force-default-action") { w.ForceDefaultAction = w.Store().MustBool("app.force-default-action", false) - logz.Verbose("reset forceDefaultAction from store value", "ForceDefaultAction", w.ForceDefaultAction) + logz.Verbose("[cmdr] postEnvLoad() - reset forceDefaultAction from store value", "ForceDefaultAction", w.ForceDefaultAction) } if tool.ToBool(os.Getenv("FORCE_DEFAULT_ACTION"), false) { w.ForceDefaultAction = true - logz.Info("set ForceDefaultAction true", "ForceDefaultAction", w.ForceDefaultAction) + logz.Info("[cmdr] postEnvLoad() - set ForceDefaultAction true", "ForceDefaultAction", w.ForceDefaultAction) } } @@ -118,7 +118,7 @@ func (w *workerS) linkCommands(root *cli.RootCommand) (err error) { root.EnsureTree(root.App(), root) // link the added builtin commands too if err = w.xrefCommands(root); err == nil { if err = w.commandsToStore(root); err == nil { - logz.Verbose("*RootCommand linked itself") + logz.Verbose("[cmdr] linkCommands() - *RootCommand linked itself") } } } @@ -183,7 +183,7 @@ func (w *workerS) loadLoaders() (err error) { appName := w.Name() jsonLoader := &jsonLoaderS{} jsonLoader.filename = path.Join(appDir, "."+appName+".json") - logz.Debug("use internal tiny json loader", "filename", jsonLoader.filename) + logz.Debug("[cmdr] use internal tiny json loader", "filename", jsonLoader.filename) w.Config.Loaders = append(w.Config.Loaders, jsonLoader) return } @@ -210,7 +210,7 @@ func (w *workerS) precheckLoaders() { } } if !found { - logz.Warn("Config file has been ignored", "config-file", w.configFile) + logz.Warn("[cmdr] Config file has been ignored", "config-file", w.configFile) } } } diff --git a/cli/worker/pre_test.go b/cli/worker/pre_test.go index e3ed600..feb388c 100644 --- a/cli/worker/pre_test.go +++ b/cli/worker/pre_test.go @@ -122,7 +122,7 @@ var ( withHelpScreenWriter(os.Stdout), }, verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if errorsv3.Is(errParsed, cli.ErrUnmatchedFlag) { - logz.Print("[INFO] ErrUnmatchedFlag FOUND, that's expecting.", "err", errParsed) + logz.Print("[cmdr] [INFO] ErrUnmatchedFlag FOUND, that's expecting.", "err", errParsed) return nil } return errParsed @@ -131,7 +131,7 @@ var ( // ~~tree {args: "ms t t --tree", verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if errorsv3.Is(errParsed, cli.ErrUnmatchedFlag) { - logz.Print("[INFO] ErrUnmatchedFlag FOUND, that's expecting.", "err", errParsed) + logz.Print("[cmdr] [INFO] ErrUnmatchedFlag FOUND, that's expecting.", "err", errParsed) return nil } return errParsed @@ -140,24 +140,24 @@ var ( // ~~tree 2 {args: "ms t t ~~tree", verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if errorsv3.Is(errParsed, cli.ErrUnmatchedFlag) { - logz.Fatal("ErrUnmatchedFlag FOUND, that's NOT expecting.") + logz.Fatal("[cmdr] ErrUnmatchedFlag FOUND, that's NOT expecting.") } if !ctx.matchedFlags[ctx.flag("tree")].DblTilde { - logz.Fatal("expecting DblTilde is true but fault.") + logz.Fatal("[cmdr] expecting DblTilde is true but fault.") } return errParsed }}, {args: "m unk snd cool", verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if !regexp.MustCompile(`UNKNOWN (Command|Flag) FOUND:?`).MatchString(errParsed.Error()) { - logz.Print("expect 'UNKNOWN Command FOUND' error, but not matched.") // "unk" + logz.Print("[cmdr] expect 'UNKNOWN Command FOUND' error, but not matched.") // "unk" } return /* errParsed */ }, opts: []cli.Opt{cli.WithUnmatchedAsError(true)}}, {args: "m snd -n -wn cool fog --pp box", verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if !regexp.MustCompile(`UNKNOWN (Command|Flag) FOUND:?`).MatchString(errParsed.Error()) { - logz.Print("expect 'UNKNOWN Flag FOUND' error, but not matched.") // "--pp" + logz.Print("[cmdr] expect 'UNKNOWN Flag FOUND' error, but not matched.") // "--pp" } hitTest(ctx, "dry-run", 2) hitTest(ctx, "wet-run", 1) @@ -185,13 +185,13 @@ var ( {args: "m snd --help"}, {args: "m unk snd cool", verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if !regexp.MustCompile(`UNKNOWN (Command|Flag) FOUND:?`).MatchString(errParsed.Error()) { - logz.Print("expect 'UNKNOWN Command FOUND' error, but not matched.") // "unk" + logz.Print("[cmdr] expect 'UNKNOWN Command FOUND' error, but not matched.") // "unk" } return /* errParsed */ }, opts: []cli.Opt{cli.WithUnmatchedAsError(true)}}, {args: "m snd -n -wn cool fog --pp box", verifier: func(w *workerS, ctx *parseCtx, errParsed error) (err error) { //nolint:revive if !regexp.MustCompile(`UNKNOWN (Command|Flag) FOUND:?`).MatchString(errParsed.Error()) { - logz.Print("expect 'UNKNOWN Flag FOUND' error, but not matched.") // "--pp" + logz.Print("[cmdr] expect 'UNKNOWN Flag FOUND' error, but not matched.") // "--pp" } hitTest(ctx, "dry-run", 2) hitTest(ctx, "wet-run", 1) @@ -288,7 +288,7 @@ func valTest(s *parseCtx, longTitle string, val any) { func assertEqual(expect, actual any, msgs ...any) { if expect != actual { - logz.Fatal(fmt.Sprintf("expecting %v but got %v", actual, expect)) + logz.Fatal(fmt.Sprintf("[cmdr] expecting %v but got %v", actual, expect)) } _ = msgs } diff --git a/cli/worker/printer.go b/cli/worker/printer.go index 4b550db..c724a03 100644 --- a/cli/worker/printer.go +++ b/cli/worker/printer.go @@ -113,7 +113,7 @@ func (s *helpPrinter) PrintTo(wr HelpWriter, ctx *parseCtx, lastCmd *cli.Command _, _ = wr.WriteString("\n") } - logz.Verbose("tty cols", "cols", cols, "rows", rows, "tree-mode", s.treeMode, "show-tree", s.w.Actions()) + logz.Verbose("[cmdr] tty cols", "cols", cols, "rows", rows, "tree-mode", s.treeMode, "show-tree", s.w.Actions()) if !s.debugMatches { return @@ -449,7 +449,7 @@ func (s *helpPrinter) printCommand(sb *strings.Builder, verboseCount *int, cc *c _, _ = sb.WriteString(" ") _, _ = sb.WriteString(dep) } - logz.Verbose("[watching] split flag", "split", split) + logz.Verbose("[cmdr] [watching] split flag", "split", split) } s.Reset(sb) // reset fg/bg colors by color Translator @@ -588,7 +588,7 @@ func (s *helpPrinter) printFlag(sb *strings.Builder, verboseCount *int, ff *cli. _, _ = sb.WriteString(" ") } _, _ = sb.WriteString(dep) - logz.Verbose("split flag is", "split", split) + logz.Verbose("[cmdr] split flag is", "split", split) } // s.ColoredFast(&sb, CurrentDefaultValueColor, def) // s.ColoredFast(&sb, CurrentDeprecatedColor, dep) diff --git a/cli/worker/shows.go b/cli/worker/shows.go index c20e8bd..4725ef8 100644 --- a/cli/worker/shows.go +++ b/cli/worker/shows.go @@ -42,7 +42,7 @@ func (w *workerS) helpSystemAction(cmd *cli.Command, args []string) (err error) for _, arg := range args { cc = cc.FindSubCommand(arg, true) if cc == nil { - logz.Error("Unknown command found.", "commands", args) + logz.Error("[cmdr] Unknown command found.", "commands", args) return errors.New("unknown command %v found", args) } } diff --git a/cli/worker/worker.go b/cli/worker/worker.go index 3b23c67..7436adf 100644 --- a/cli/worker/worker.go +++ b/cli/worker/worker.go @@ -202,7 +202,7 @@ func (w *workerS) reqResourcesReady() (yes bool) { func (w *workerS) Close() { if atomic.CompareAndSwapInt32(&w.closed, 0, 1) { - logz.Debug("Runner(*workerS) closed.") + logz.Debug("[cmdr] Runner(*workerS) closed.") } } @@ -262,11 +262,11 @@ func (w *workerS) InitGlobally() { func (w *workerS) initGlobalResources() { defer w.triggerGlobalResourcesInitOK() - logz.Debug("workerS.initGlobalResources") + logz.Debug("[cmdr] workerS.initGlobalResources") } func (w *workerS) triggerGlobalResourcesInitOK() { - logz.Debug("workerS.triggerGlobalResourcesInitOK") + logz.Debug("[cmdr] workerS.triggerGlobalResourcesInitOK") } func (w *workerS) attachErrors(errs ...error) { //nolint:revive,unused diff --git a/cmdr.go b/cmdr.go index 1d8ca16..2959e8d 100644 --- a/cmdr.go +++ b/cmdr.go @@ -70,7 +70,7 @@ import ( // its subcommands are the main characters - but you still can do that. func New(opts ...cli.Opt) cli.App { _ = os.Setenv("CMDR_VERSION", Version) - logz.Verbose("setup env-var at earlier time", "CMDR_VERSION", Version) + logz.Verbose("[cmdr] setup env-var at earlier time", "CMDR_VERSION", Version) cfg := cli.NewConfig(opts...) w := worker.New(cfg) return builder.New(w) diff --git a/internal/tool/dirs.go b/internal/tool/dirs.go index 9702d3d..2c47f75 100644 --- a/internal/tool/dirs.go +++ b/internal/tool/dirs.go @@ -28,7 +28,7 @@ func DataDir(appName string, base ...string) string { case "plan9": dir := os.Getenv("home") if dir == "" { - logz.Error("$home is not defined") + logz.Error("[cmdr] $home is not defined") return "" } return filepath.Join(append([]string{dir, "lib", "data", appName}, base...)...) @@ -79,7 +79,7 @@ func ConfigDir(appName string, base ...string) string { case "plan9": dir := os.Getenv("home") if dir == "" { - logz.Error("$home is not defined") + logz.Error("[cmdr] $home is not defined") return "" } return filepath.Join(append([]string{dir, "lib", appName}, base...)...) @@ -122,7 +122,7 @@ func CacheDir(appName string, base ...string) string { case "plan9": dir := os.Getenv("home") if dir == "" { - logz.Error("$home is not defined") + logz.Error("[cmdr] $home is not defined") return "" } return filepath.Join(append([]string{dir, "lib", "cache", appName}, base...)...) @@ -165,13 +165,13 @@ func TempFileName(fileNamePattern, defaultFileName string, appName string, base tmpDir := TempDir(appName, base...) err := dir.EnsureDir(tmpDir) if err != nil { - logz.Error("cannot creating tmpdir", "tmpdir", tmpDir, "err", err) + logz.Error("[cmdr] cannot creating tmpdir", "tmpdir", tmpDir, "err", err) return defaultFileName } f, err := os.CreateTemp(tmpDir, fileNamePattern) if err != nil { - logz.Error("cannot create temporary file for flag", "err", err) + logz.Error("[cmdr] cannot create temporary file for flag", "err", err) return defaultFileName } filename = f.Name()