From f79716d6cf0a546644930b903466786df99e61dc Mon Sep 17 00:00:00 2001 From: Zhao Lei Date: Mon, 23 May 2016 17:32:00 +0800 Subject: [PATCH] Unify log setting's error output When we set a wrong --log-format value, runc exit without any message: # ./runc --log-format aaa list # It is again "no news is good news" rule. And it is not unified with the case when we set a wrong --log value: # ./runc --log / list ERRO[0000] open /: is a directory open /: is a directory # This patch unified action for above two error-setting. After patch: # ./runc --log-format aaa list unknown log-format: "aaa" # Signed-off-by: Zhao Lei --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 1ceac4468..1b0df8a2c 100644 --- a/main.go +++ b/main.go @@ -118,7 +118,7 @@ func main() { case "json": logrus.SetFormatter(new(logrus.JSONFormatter)) default: - logrus.Fatalf("unknown log-format %q", context.GlobalString("log-format")) + return fmt.Errorf("unknown log-format %q", context.GlobalString("log-format")) } return nil }