From a5e5ccb3653af5cc9a43c8b9293ec064c85a2451 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 27 Sep 2017 11:33:03 +0200
Subject: [PATCH] main: Replace -debug with -log-level

Running crio with -debug is very verbose. Having more granularity
on the log level can be useful when e.g. only looking for errors.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---
 cmd/crio/main.go  | 18 ++++++++++++------
 docs/crio.8.md    |  8 ++++----
 kubernetes.md     |  2 +-
 test/helpers.bash |  2 +-
 tutorial.md       |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cmd/crio/main.go b/cmd/crio/main.go
index de67ca51..e50e67bf 100644
--- a/cmd/crio/main.go
+++ b/cmd/crio/main.go
@@ -197,10 +197,6 @@ func main() {
 			Name:  "conmon",
 			Usage: "path to the conmon executable",
 		},
-		cli.BoolFlag{
-			Name:  "debug",
-			Usage: "enable debug output for logging",
-		},
 		cli.StringFlag{
 			Name:  "listen",
 			Usage: "path to crio socket",
@@ -223,6 +219,11 @@ func main() {
 			Value: "text",
 			Usage: "set the format used by logs ('text' (default), or 'json')",
 		},
+		cli.StringFlag{
+			Name:  "log-level",
+			Usage: "log messages above specified level: debug, info (default), warn, error, fatal or panic",
+		},
+
 		cli.StringFlag{
 			Name:  "pause-command",
 			Usage: "name of the pause command in the pause image",
@@ -361,8 +362,13 @@ func main() {
 
 		logrus.SetFormatter(cf)
 
-		if c.GlobalBool("debug") {
-			logrus.SetLevel(logrus.DebugLevel)
+		if loglevel := c.GlobalString("log-level"); loglevel != "" {
+			level, err := logrus.ParseLevel(loglevel)
+			if err != nil {
+				return err
+			}
+
+			logrus.SetLevel(level)
 		}
 
 		if path := c.GlobalString("log"); path != "" {
diff --git a/docs/crio.8.md b/docs/crio.8.md
index a6cf27b8..36b4ccdb 100644
--- a/docs/crio.8.md
+++ b/docs/crio.8.md
@@ -13,13 +13,13 @@ crio - OCI Kubernetes Container Runtime daemon
 [**--config**=[*value*]]
 [**--conmon**=[*value*]]
 [**--cpu-profile**=[*value*]]
-[**--debug**]
 [**--default-transport**=[*value*]]
 [**--help**|**-h**]
 [**--insecure-registry**=[*value*]]
 [**--listen**=[*value*]]
 [**--log**=[*value*]]
 [**--log-format value**]
+[**--log-level value**]
 [**--pause-command**=[*value*]]
 [**--pause-image**=[*value*]]
 [**--registry**=[*value*]]
@@ -66,9 +66,6 @@ crio is meant to provide an integration path between OCI conformant runtimes and
 **--cpu-profile**=""
 set the CPU profile file path
 
-**--debug**
-  Enable debug output for logging
-
 **--default-transport**
   A prefix to prepend to image names that can't be pulled as-is.
 
@@ -105,6 +102,9 @@ set the CPU profile file path
 **--log-format**=""
   Set the format used by logs ('text' (default), or 'json') (default: "text")
 
+**--log-level**=""
+  log CRI-O messages above specified level: debug, info (default), warn, error, fatal or panic
+
 **--log-size-max**=""
   Maximum log size in bytes for a container (default: -1 (no limit))
 
diff --git a/kubernetes.md b/kubernetes.md
index 5585c494..c2aa8bf8 100644
--- a/kubernetes.md
+++ b/kubernetes.md
@@ -36,7 +36,7 @@ Description=CRI-O daemon
 Documentation=https://github.com/kubernetes-incubator/cri-o
 
 [Service]
-ExecStart=/bin/crio --runtime /bin/runc --log /root/crio.log --debug
+ExecStart=/bin/crio --runtime /bin/runc --log /root/crio.log --log-level debug
 Restart=always
 RestartSec=10s
 
diff --git a/test/helpers.bash b/test/helpers.bash
index e68fd5e1..0024dcf5 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -245,7 +245,7 @@ function start_crio() {
 	fi
 	${netfunc} $POD_CIDR
 
-	"$CRIO_BINARY" --debug --config "$CRIO_CONFIG" & CRIO_PID=$!
+	"$CRIO_BINARY" --log-level debug --config "$CRIO_CONFIG" & CRIO_PID=$!
 	wait_until_reachable
 
 	run crictl inspecti redis:alpine
diff --git a/tutorial.md b/tutorial.md
index 43052dd9..07a03964 100644
--- a/tutorial.md
+++ b/tutorial.md
@@ -163,7 +163,7 @@ Description=OCI-based implementation of Kubernetes Container Runtime Interface
 Documentation=https://github.com/kubernetes-incubator/cri-o
 
 [Service]
-ExecStart=/usr/local/bin/crio --debug
+ExecStart=/usr/local/bin/crio --log-level debug
 Restart=on-failure
 RestartSec=5