Prevent controller from crashing due to glog writing to /tmp (#1613)

argoproj · Sep 21, 2019 · a317fbf · a317fbf
1 parent 20e91ea
commit a317fbf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 53 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/argoexec/commands/root.go b/cmd/argoexec/commands/root.go
@@ -40,6 +40,7 @@ func init() {
 
 func initConfig() {
 	cli.SetLogLevel(logLevel)
+	cli.SetGLogLevel(glogLevel)
 }
 
 func NewRootCommand() *cobra.Command {

diff --git a/cmd/workflow-controller/main.go b/cmd/workflow-controller/main.go
@@ -44,6 +44,7 @@ func NewRootCommand() *cobra.Command {
 		Short: "workflow-controller is the controller to operate on workflows",
 		RunE: func(c *cobra.Command, args []string) error {
 			cli.SetLogLevel(logLevel)
+			cli.SetGLogLevel(glogLevel)
 			stats.RegisterStackDumper()
 			stats.StartStatsTicker(5 * time.Minute)
 

diff --git a/util/cmd/cmd.go b/util/cmd/cmd.go
@@ -73,22 +73,6 @@ func IsURL(u string) bool {
 	return false
 }
 
-// SetLogLevel sets the logrus logging level
-func SetLogLevel(level string) {
-	switch strings.ToLower(level) {
-	case "debug":
-		log.SetLevel(log.DebugLevel)
-	case "info":
-		log.SetLevel(log.InfoLevel)
-	case "warn":
-		log.SetLevel(log.WarnLevel)
-	case "error":
-		log.SetLevel(log.ErrorLevel)
-	default:
-		log.Fatalf("Unknown level: %s", level)
-	}
-}
-
 // ParseLabels turns a string representation of a label set into a map[string]string
 func ParseLabels(labelSpec interface{}) (map[string]string, error) {
 	labelString, isString := labelSpec.(string)