Browse Source

logging vebosity

Matthew R. Kasun 3 years ago
parent
commit
5c48b5e474
2 changed files with 7 additions and 11 deletions
  1. 4 10
      logger/util.go
  2. 3 1
      servercfg/serverconf.go

+ 4 - 10
logger/util.go

@@ -1,9 +1,9 @@
 package logger
 package logger
 
 
 import (
 import (
-	"os"
-	"strconv"
 	"strings"
 	"strings"
+
+	"github.com/gravitl/netmaker/servercfg"
 )
 )
 
 
 // Verbosity - current logging verbosity level (optionally set)
 // Verbosity - current logging verbosity level (optionally set)
@@ -25,12 +25,6 @@ func getVerbose() int32 {
 	if Verbosity >= 1 && Verbosity <= 3 {
 	if Verbosity >= 1 && Verbosity <= 3 {
 		return int32(Verbosity)
 		return int32(Verbosity)
 	}
 	}
-	level, err := strconv.Atoi(os.Getenv("VERBOSITY"))
-	if err != nil || level < 0 {
-		level = 0
-	}
-	if level > 3 {
-		level = 3
-	}
-	return int32(level)
+	Verbosity = servercfg.GetVerbosity()
+	return int32(Verbosity)
 }
 }

+ 3 - 1
servercfg/serverconf.go

@@ -364,7 +364,9 @@ func GetVerbosity() int {
 	} else if config.Config.Server.Verbosity != 0 {
 	} else if config.Config.Server.Verbosity != 0 {
 		verbosity = config.Config.Server.Verbosity
 		verbosity = config.Config.Server.Verbosity
 	}
 	}
-	logger.Verbosity = int(verbosity)
+	if verbosity < 0 || verbosity > 3 {
+		verbosity = 0
+	}
 	return verbosity
 	return verbosity
 }
 }