mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-10-25 14:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix output formats

Browse Source 
This fixes random log issues.

Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
This commit is contained in:
Andrew Rynhard 2019-12-23 08:41:35 -08:00
parent a490e3c7ea
commit 0fae1bc92d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/osctl/cmd/upgrade.go
View File

@ -64,7 +64,7 @@ func upgrade() error {
node = msg.Metadata.Hostname 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() return w.Flush()

4
internal/app/machined/pkg/system/runner/restart/restart.go
View File

@ -136,12 +136,12 @@ func (r *restarter) Run(eventSink events.Recorder) error {
return nil 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: case Forever:
if err == nil { if err == nil {
eventSink(events.StateWaiting, "Runner %s exited without error, going to restart it", r.wrappedRunner) eventSink(events.StateWaiting, "Runner %s exited without error, going to restart it", r.wrappedRunner)
} else { } 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)
} }
} }

12
internal/app/networkd/pkg/networkd/networkd.go
View File

@ -172,17 +172,17 @@ func (n *Networkd) Configure() (err error) {
// Ensure link exists // Ensure link exists
if err = netif.Create(); err != nil { if err = netif.Create(); err != nil {
log.Println("error creating nic", err) log.Printf("error creating nic: %v", err)
return return
} }
if err = netif.Configure(); err != nil { if err = netif.Configure(); err != nil {
log.Println("error configuring nic", err) log.Printf("error configuring nic: %v", err)
return return
} }
if err = netif.Addressing(); err != nil { if err = netif.Addressing(); err != nil {
log.Println("error configuring addressing", err) log.Printf("error configuring addressing: %v", err)
return return
} }
}(iface, &wg) }(iface, &wg)
@ -207,17 +207,17 @@ func (n *Networkd) Configure() (err error) {
// Ensure link exists // Ensure link exists
if err = netif.Create(); err != nil { if err = netif.Create(); err != nil {
log.Println("error creating nic", err) log.Printf("error creating nic: %v", err)
return return
} }
if err = netif.Configure(); err != nil { if err = netif.Configure(); err != nil {
log.Println("error configuring nic", err) log.Printf("error configuring nic: %v", err)
return return
} }
if err = netif.Addressing(); err != nil { if err = netif.Addressing(); err != nil {
log.Println("error configuring addressing", err) log.Printf("error configuring addressing: %v", err)
return return
} }
}(iface, &wg) }(iface, &wg)