webnet/tailscale
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

cmd/tailscale/cli: fix time parsing in debug daemon-logs (#19875)

Browse Source 
Fixes #19874

Signed-off-by: Erisa A <erisa@tailscale.com>
This commit is contained in:
Erisa A
2026-05-27 12:30:28 +01:00
committed by GitHub
parent 0ed6da2826
commit e2a0d45418
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/tailscale/cli/debug.go
+8 -5
View File
@@ -786,10 +786,13 @@ func runDaemonLogs(ctx context.Context, args []string) error {
} }
d := json.NewDecoder(logs) d := json.NewDecoder(logs)
for { for {
type logtail struct {
Time string `json:"client_time"`
}
var line struct { var line struct {
Text string `json:"text"` Text string `json:"text"`
Verbose int `json:"v"` Verbose int `json:"v"`
Time string `json:"client_time"` Logtail logtail `json:"logtail"`
} }
err := d.Decode(&line) err := d.Decode(&line)
if err != nil { if err != nil {
@@ -799,8 +802,8 @@ func runDaemonLogs(ctx context.Context, args []string) error {
if line.Text == "" || line.Verbose > daemonLogsArgs.verbose { if line.Text == "" || line.Verbose > daemonLogsArgs.verbose {
continue continue
} }
if daemonLogsArgs.time { if daemonLogsArgs.time && line.Logtail.Time != "" {
fmt.Printf("%s %s\n", line.Time, line.Text) fmt.Printf("%s %s\n", line.Logtail.Time, line.Text)
} else { } else {
fmt.Println(line.Text) fmt.Println(line.Text)
} }