From 0fae1bc92d0511bb93e08bb0aa0d3d49fad4f1ff Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Mon, 23 Dec 2019 08:41:35 -0800 Subject: [PATCH] fix: fix output formats This fixes random log issues. Signed-off-by: Andrew Rynhard --- cmd/osctl/cmd/upgrade.go | 2 +- .../machined/pkg/system/runner/restart/restart.go | 4 ++-- internal/app/networkd/pkg/networkd/networkd.go | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/osctl/cmd/upgrade.go b/cmd/osctl/cmd/upgrade.go index a5793a325..1b28a4ba2 100644 --- a/cmd/osctl/cmd/upgrade.go +++ b/cmd/osctl/cmd/upgrade.go @@ -64,7 +64,7 @@ func upgrade() error { node = msg.Metadata.Hostname } - fmt.Fprintf(w, "%s\t%s\t%s\t", node, msg.Ack, time.Now()) + fmt.Fprintf(w, "%s\t%s\t%s\t\n", node, msg.Ack, time.Now()) } return w.Flush() diff --git a/internal/app/machined/pkg/system/runner/restart/restart.go b/internal/app/machined/pkg/system/runner/restart/restart.go index ace08838d..05f84f408 100644 --- a/internal/app/machined/pkg/system/runner/restart/restart.go +++ b/internal/app/machined/pkg/system/runner/restart/restart.go @@ -136,12 +136,12 @@ func (r *restarter) Run(eventSink events.Recorder) error { return nil } - eventSink(events.StateWaiting, "Error running %s, going to restart until it succeeds: %w", r.wrappedRunner, err) + eventSink(events.StateWaiting, "Error running %s, going to restart until it succeeds: %v", r.wrappedRunner, err) case Forever: if err == nil { eventSink(events.StateWaiting, "Runner %s exited without error, going to restart it", r.wrappedRunner) } else { - eventSink(events.StateWaiting, "Error running %v, going to restart forever: %w", r.wrappedRunner, err) + eventSink(events.StateWaiting, "Error running %v, going to restart forever: %v", r.wrappedRunner, err) } } diff --git a/internal/app/networkd/pkg/networkd/networkd.go b/internal/app/networkd/pkg/networkd/networkd.go index 88fa09e21..dea553a09 100644 --- a/internal/app/networkd/pkg/networkd/networkd.go +++ b/internal/app/networkd/pkg/networkd/networkd.go @@ -172,17 +172,17 @@ func (n *Networkd) Configure() (err error) { // Ensure link exists if err = netif.Create(); err != nil { - log.Println("error creating nic", err) + log.Printf("error creating nic: %v", err) return } if err = netif.Configure(); err != nil { - log.Println("error configuring nic", err) + log.Printf("error configuring nic: %v", err) return } if err = netif.Addressing(); err != nil { - log.Println("error configuring addressing", err) + log.Printf("error configuring addressing: %v", err) return } }(iface, &wg) @@ -207,17 +207,17 @@ func (n *Networkd) Configure() (err error) { // Ensure link exists if err = netif.Create(); err != nil { - log.Println("error creating nic", err) + log.Printf("error creating nic: %v", err) return } if err = netif.Configure(); err != nil { - log.Println("error configuring nic", err) + log.Printf("error configuring nic: %v", err) return } if err = netif.Addressing(); err != nil { - log.Println("error configuring addressing", err) + log.Printf("error configuring addressing: %v", err) return } }(iface, &wg)