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

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
+8 -5
View File
@@ -786,10 +786,13 @@ func runDaemonLogs(ctx context.Context, args []string) error {
}
d := json.NewDecoder(logs)
for {
type logtail struct {
Time string `json:"client_time"`
}
var line struct {
Text string `json:"text"`
Verbose int `json:"v"`
Time string `json:"client_time"`
Text string `json:"text"`
Verbose int `json:"v"`
Logtail logtail `json:"logtail"`
}
err := d.Decode(&line)
if err != nil {
@@ -799,8 +802,8 @@ func runDaemonLogs(ctx context.Context, args []string) error {
if line.Text == "" || line.Verbose > daemonLogsArgs.verbose {
continue
}
if daemonLogsArgs.time {
fmt.Printf("%s %s\n", line.Time, line.Text)
if daemonLogsArgs.time && line.Logtail.Time != "" {
fmt.Printf("%s %s\n", line.Logtail.Time, line.Text)
} else {
fmt.Println(line.Text)
}