Add "Error: " prefix to fatal errors from k3s app entry points

Makes logged output more consistent when k3s fails during initialization Signed-off-by: Brad Davidson <[email protected]>
k3s-io · Dec 20, 2024 · 68f26fe · 68f26fe
1 parent 763188d
commit 68f26fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -19,6 +19,6 @@ func main() {
 	}
 
 	if err := app.Run(configfilearg.MustParse(os.Args)); err != nil && !errors.Is(err, context.Canceled) {
-		logrus.Fatal(err)
+		logrus.Fatalf("Error: %v", err)
 	}
 }
diff --git a/cmd/k3s/main.go b/cmd/k3s/main.go
@@ -89,7 +89,7 @@ func main() {
 	}
 
 	if err := app.Run(os.Args); err != nil && !errors.Is(err, context.Canceled) {
-		logrus.Fatal(err)
+		logrus.Fatalf("Error: %v", err)
 	}
 }
 

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -80,6 +80,6 @@ func main() {
 	}
 
 	if err := app.Run(configfilearg.MustParse(os.Args)); err != nil && !errors.Is(err, context.Canceled) {
-		logrus.Fatal(err)
+		logrus.Fatalf("Error: %v", err)
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ func main() { @@
     	}
     	if err := app.Run(os.Args); err != nil && !errors.Is(err, context.Canceled) {
-    		logrus.Fatal(err)
+    		logrus.Fatalf("Error: %v", err)
     	}
     }
@@ Expand Down @@