philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 11:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(logs): encapsulate printing errors in PrintEntry

Browse Source
This commit is contained in:
Pasha Sviderski
2026-04-22 11:32:23 +10:00
parent 19c13f6cd2
commit 5b5cd44d68
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/uncloud/machine/logs.go
-4
View File
@@ -125,10 +125,6 @@ func runLogs(ctx context.Context, uncli *cli.CLI, units []string, opts logs.Opti
// Print merged logs. // Print merged logs.
for entry := range stream { for entry := range stream {
if entry.Err != nil {
formatter.PrintError(entry)
continue
}
formatter.PrintEntry(entry) formatter.PrintEntry(entry)
} }
cmd/uncloud/service/logs.go
-4
View File
@@ -180,10 +180,6 @@ func runLogs(ctx context.Context, uncli *cli.CLI, args []string, opts logs.Optio
// Print merged logs. // Print merged logs.
for entry := range stream { for entry := range stream {
if entry.Err != nil {
formatter.PrintError(entry)
continue
}
formatter.PrintEntry(entry) formatter.PrintEntry(entry)
} }
internal/cli/logs/formatter.go
+8 -4
View File
@@ -107,6 +107,10 @@ func (f *Formatter) formatService(serviceName, containerID string) string {
// PrintEntry prints a single log entry with proper formatting. // PrintEntry prints a single log entry with proper formatting.
func (f *Formatter) PrintEntry(entry api.ServiceLogEntry) { func (f *Formatter) PrintEntry(entry api.ServiceLogEntry) {
if entry.Err != nil {
f.printError(entry)
return
}
if entry.Stream != api.LogStreamStdout && entry.Stream != api.LogStreamStderr { if entry.Stream != api.LogStreamStdout && entry.Stream != api.LogStreamStderr {
return return
} }
@@ -136,11 +140,11 @@ func (f *Formatter) PrintEntry(entry api.ServiceLogEntry) {
} }
} }
// PrintError prints an error entry (e.g., stalled stream warning). // printError prints an error entry (e.g., stalled stream warning).
func (f *Formatter) PrintError(entry api.ServiceLogEntry) { func (f *Formatter) printError(entry api.ServiceLogEntry) {
if entry.Metadata.ServiceName == "" { if entry.Metadata.ServiceName == "" {
msg := fmt.Sprintf("ERROR: %v", entry.Err) msg := fmt.Sprintf("ERROR: %v", entry.Err)
style := lipgloss.NewStyle().Bold(true).Foreground(lipgloss.BrightRed) // Bold bright red. style := lipgloss.NewStyle().Bold(true).Foreground(lipgloss.BrightRed)
fmt.Fprintln(os.Stderr, style.Render(msg)) fmt.Fprintln(os.Stderr, style.Render(msg))
return return
} }
@@ -163,7 +167,7 @@ func (f *Formatter) PrintError(entry api.ServiceLogEntry) {
msg += fmt.Sprintf(": %v", entry.Err) msg += fmt.Sprintf(": %v", entry.Err)
} }
style := lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("11")) // Bold bright yellow. style := lipgloss.NewStyle().Bold(true).Foreground(lipgloss.BrightYellow)
fmt.Fprintln(os.Stderr, style.Render(msg)) fmt.Fprintln(os.Stderr, style.Render(msg))
} }