diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-05 19:48:27 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-05 19:48:27 -0700 |
| commit | cd01485ec126c103fa9ab718685d184b70d0e1ff (patch) | |
| tree | 0c003455bf0795a04e4fb198d2e85e2c7b63ffb3 /lib/textui/log.go | |
| parent | f416f777b2c2cac095e851e6799020f91e34aed1 (diff) | |
| parent | 3b385f26973e45b4c2e2f3ebf9d52ab0131cff5e (diff) | |
Merge branch 'lukeshu/rebuild-nodes-take4'
Diffstat (limited to 'lib/textui/log.go')
| -rw-r--r-- | lib/textui/log.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/textui/log.go b/lib/textui/log.go index 801e9eb..110e1aa 100644 --- a/lib/textui/log.go +++ b/lib/textui/log.go @@ -180,7 +180,7 @@ func (l *logger) log(lvl dlog.LogLevel, writeMsg func(io.Writer)) { // time //////////////////////////////////////////////////////////////// now := time.Now() - const timeFmt = "2006-01-02 15:04:05.0000" + const timeFmt = "15:04:05.0000" logBuf.WriteString(timeFmt) now.AppendFormat(logBuf.Bytes()[:0], timeFmt) @@ -317,18 +317,22 @@ func fieldOrd(key string) int { return -25 // step=rebuild (any substep) case "btrfsinspect.rebuild-nodes.rebuild.want.key": - return -7 + return -9 case "btrfsinspect.rebuild-nodes.rebuild.want.reason": - return -6 + return -8 case "btrfsinspect.rebuild-nodes.rebuild.add-tree": + return -7 + case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.key": + return -6 + case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.reason": return -5 - case "btrfsinspect.rebuild-nodes.rebuild.add-tree.substep": + case "btrfsinspect.rebuild-nodes.rebuild.add-root": return -4 - case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.key": + case "btrfsinspect.rebuild-nodes.rebuild.index-inc-items": return -3 - case "btrfsinspect.rebuild-nodes.rebuild.add-tree.want.reason": + case "btrfsinspect.rebuild-nodes.rebuild.index-all-items": return -2 - case "btrfsinspect.rebuild-nodes.rebuild.add-root": + case "btrfsinspect.rebuild-nodes.rebuild.index-nodes": return -1 // other /////////////////////////////////////////////////////////////// @@ -368,6 +372,7 @@ func writeField(w io.Writer, key string, val any) { if strings.HasPrefix(valStr, "/main/") { valStr = strings.TrimPrefix(valStr, "/main") } + valStr = strings.TrimPrefix(valStr, "/") } case strings.HasSuffix(name, ".pass"): fmt.Fprintf(w, "/pass-%s", valStr) |