diff --git a/logger/util.go b/logger/util.go index bc4c9f75..9a2928ef 100644 --- a/logger/util.go +++ b/logger/util.go @@ -2,8 +2,6 @@ package logger import ( "strings" - - "github.com/gravitl/netmaker/servercfg" ) // Verbosity - current logging verbosity level (optionally set) @@ -25,6 +23,5 @@ func getVerbose() int32 { if Verbosity >= 1 && Verbosity <= 4 { return int32(Verbosity) } - Verbosity = int(servercfg.GetVerbosity()) return int32(Verbosity) } diff --git a/main.go b/main.go index e177c1c6..adda6c96 100644 --- a/main.go +++ b/main.go @@ -42,6 +42,7 @@ func main() { fmt.Println(models.RetrieveLogo()) // print the logo initialize() // initial db and acls; gen cert if required setGarbageCollection() + setVerbosity() defer database.CloseDB() startControllers() // start the api endpoint and mq } @@ -182,6 +183,11 @@ func runMessageQueue(wg *sync.WaitGroup) { client.Disconnect(250) } +func setVerbosity() { + verbose := int(servercfg.GetVerbosity()) + logger.Verbosity = verbose +} + func setGarbageCollection() { _, gcset := os.LookupEnv("GOGC") if !gcset { diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index 4f42a95d..ea2c8434 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -2,7 +2,6 @@ package servercfg import ( "errors" - "fmt" "io" "net/http" "os" @@ -11,6 +10,7 @@ import ( "time" "github.com/gravitl/netmaker/config" + "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/models" ) @@ -430,14 +430,14 @@ func GetPublicIP() (string, error) { iplist := []string{"https://ip.server.gravitl.com", "https://ifconfig.me", "https://api.ipify.org", "https://ipinfo.io/ip"} publicIpService := os.Getenv("PUBLIC_IP_SERVICE") if publicIpService != "" { - fmt.Println("User provided public IP service is", publicIpService) + logger.Log(3, "User provided public IP service is", publicIpService) // prepend the user-specified service so it's checked first iplist = append([]string{publicIpService}, iplist...) } for _, ipserver := range iplist { - fmt.Println("Running public IP check with service", ipserver) + logger.Log(3, "Running public IP check with service", ipserver) client := &http.Client{ Timeout: time.Second * 10, } @@ -452,7 +452,7 @@ func GetPublicIP() (string, error) { continue } endpoint = string(bodyBytes) - fmt.Println("Public IP address is", endpoint) + logger.Log(3, "Public IP address is", endpoint) break } }