Browse Source

permit setting of verbosity from config

Signed-off-by: Matthew R. Kasun <[email protected]>
Matthew R. Kasun 3 years ago
parent
commit
fa29b09aab
2 changed files with 17 additions and 1 deletions
  1. 1 1
      config/config.go
  2. 16 0
      servercfg/serverconf.go

+ 1 - 1
config/config.go

@@ -52,7 +52,7 @@ type ServerConfig struct {
 	Platform              string `yaml:"platform"`
 	Platform              string `yaml:"platform"`
 	Database              string `yaml:"database"`
 	Database              string `yaml:"database"`
 	DefaultNodeLimit      int32  `yaml:"defaultnodelimit"`
 	DefaultNodeLimit      int32  `yaml:"defaultnodelimit"`
-	Verbosity             int32  `yaml:"verbosity"`
+	Verbosity             int    `yaml:"verbosity"`
 	ServerCheckinInterval int64  `yaml:"servercheckininterval"`
 	ServerCheckinInterval int64  `yaml:"servercheckininterval"`
 	AuthProvider          string `yaml:"authprovider"`
 	AuthProvider          string `yaml:"authprovider"`
 	ClientID              string `yaml:"clientid"`
 	ClientID              string `yaml:"clientid"`

+ 16 - 0
servercfg/serverconf.go

@@ -90,6 +90,7 @@ func GetServerConfig() config.ServerConfig {
 	services := strings.Join(GetPortForwardServiceList(), ",")
 	services := strings.Join(GetPortForwardServiceList(), ",")
 	cfg.PortForwardServices = services
 	cfg.PortForwardServices = services
 	cfg.Server = GetServer()
 	cfg.Server = GetServer()
+	cfg.Verbosity = GetVerbosity()
 
 
 	return cfg
 	return cfg
 }
 }
@@ -352,6 +353,21 @@ func GetServer() string {
 	return server
 	return server
 }
 }
 
 
+func GetVerbosity() int {
+	var verbosity = 0
+	var err error
+	if os.Getenv("VERBOSITY") != "" {
+		verbosity, err = strconv.Atoi(os.Getenv("VERBOSITY"))
+		if err != nil {
+			verbosity = 0
+		}
+	} else if config.Config.Server.Verbosity != 0 {
+		verbosity = config.Config.Server.Verbosity
+	}
+	logger.Verbosity = int(verbosity)
+	return verbosity
+}
+
 // IsDNSMode - should it run with DNS
 // IsDNSMode - should it run with DNS
 func IsDNSMode() bool {
 func IsDNSMode() bool {
 	isdns := true
 	isdns := true