git.iko.soy/crush
on main help sign in
chore: sort keys
f83e773Kujtim Hoxha
cmd/logs.go+9−3
compare with main
unifiedsplit
@@ -4,6 +4,7 @@ import (
4 "encoding/json"
4 "encoding/json"
5 "fmt"
5 "fmt"
6 "path/filepath"
6 "path/filepath"
7+ "slices"
7 "time"
8 "time"
8
9
9 "github.com/charmbracelet/crush/pkg/config"
10 "github.com/charmbracelet/crush/pkg/config"
@@ -44,12 +45,17 @@ var logsCmd = &cobra.Command{
44 msg := data["msg"]
45 msg := data["msg"]
45 level := data["level"]
46 level := data["level"]
46 otherData := []any{}
47 otherData := []any{}
48+ keys := []string{}
47− for k, v := range data {
49+ for k := range data {
50+ keys = append(keys, k)
51+ }
52+ slices.Sort(keys)
53+ for _, k := range keys {
48 switch k {
54 switch k {
49 case "msg", "level", "time":
55 case "msg", "level", "time":
50 continue
56 continue
51 case "source":
57 case "source":
52− source, ok := v.(map[string]any)
58+ source, ok := data[k].(map[string]any)
53 if !ok {
59 if !ok {
54 continue
60 continue
55 }
61 }
@@ -57,7 +63,7 @@ var logsCmd = &cobra.Command{
57 otherData = append(otherData, "source", sourceFile)
63 otherData = append(otherData, "source", sourceFile)
58
64
59 default:
65 default:
60− otherData = append(otherData, k, v)
66+ otherData = append(otherData, k, data[k])
61 }
67 }
62 }
68 }
63 log.SetTimeFunction(func(_ time.Time) time.Time {
69 log.SetTimeFunction(func(_ time.Time) time.Time {