From f11f0748e93a610651dbbbfa8bbd040005cd7e71 Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Fri, 14 Jan 2022 09:21:22 -0800
Subject: [PATCH] Enable logging on all subcommands (#4921) (#4932)

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 pkg/cli/cmds/agent.go  |  2 +-
 pkg/cli/cmds/log.go    |  4 ++++
 pkg/cli/cmds/root.go   | 14 --------------
 pkg/cli/cmds/server.go |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go
index 6d24e5f23f..b12f816ff9 100644
--- a/pkg/cli/cmds/agent.go
+++ b/pkg/cli/cmds/agent.go
@@ -214,7 +214,7 @@ func NewAgentCommand(action func(ctx *cli.Context) error) cli.Command {
 		Name:      "agent",
 		Usage:     "Run node agent",
 		UsageText: appName + " agent [OPTIONS]",
-		Before:    SetupDebug(CheckSELinuxFlags),
+		Before:    CheckSELinuxFlags,
 		Action:    action,
 		Flags: []cli.Flag{
 			ConfigFlag,
diff --git a/pkg/cli/cmds/log.go b/pkg/cli/cmds/log.go
index 3f896fcc11..32586bf798 100644
--- a/pkg/cli/cmds/log.go
+++ b/pkg/cli/cmds/log.go
@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
@@ -76,4 +77,7 @@ func setupLogging() {
 	flag.Set("vmodule", LogConfig.VModule)
 	flag.Set("alsologtostderr", strconv.FormatBool(Debug))
 	flag.Set("logtostderr", strconv.FormatBool(!Debug))
+	if Debug {
+		logrus.SetLevel(logrus.DebugLevel)
+	}
 }
diff --git a/pkg/cli/cmds/root.go b/pkg/cli/cmds/root.go
index 13d523b430..e84a211bda 100644
--- a/pkg/cli/cmds/root.go
+++ b/pkg/cli/cmds/root.go
@@ -7,7 +7,6 @@ import (
 	"runtime"
 
 	"github.com/rancher/k3s/pkg/version"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
@@ -46,19 +45,6 @@ func NewApp() *cli.App {
 			Usage: "(data) Folder to hold state default /var/lib/rancher/" + version.Program + " or ${HOME}/.rancher/" + version.Program + " if not root",
 		},
 	}
-	app.Before = SetupDebug(nil)
 
 	return app
 }
-
-func SetupDebug(next func(ctx *cli.Context) error) func(ctx *cli.Context) error {
-	return func(ctx *cli.Context) error {
-		if Debug {
-			logrus.SetLevel(logrus.DebugLevel)
-		}
-		if next != nil {
-			return next(ctx)
-		}
-		return nil
-	}
-}
diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index f9d8160b6c..c341d1854d 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -498,7 +498,7 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
 		Name:      "server",
 		Usage:     "Run management server",
 		UsageText: appName + " server [OPTIONS]",
-		Before:    SetupDebug(CheckSELinuxFlags),
+		Before:    CheckSELinuxFlags,
 		Action:    action,
 		Flags:     ServerFlags,
 	}