Skip to content
Snippets Groups Projects
Commit 02f26b71 authored by Florent Gluck's avatar Florent Gluck
Browse files

server: fixed log level setting which wasn't working properly

parent 97546213
No related branches found
No related tags found
No related merge requests found
package config package config
import ( import (
"nexus-common/buildversion"
"nexus-server/logger" "nexus-server/logger"
"nexus-server/version"
"os" "os"
"path"
"path/filepath" "path/filepath"
"strings" "strings"
"sync" "sync"
...@@ -64,6 +67,12 @@ var once sync.Once ...@@ -64,6 +67,12 @@ var once sync.Once
func GetInstance() *Config { func GetInstance() *Config {
once.Do(func() { once.Do(func() {
log.SetLevel(logrus.InfoLevel)
var appname = path.Base(os.Args[0])
serverVersion := version.Get()
log.Info(appname + " version " + serverVersion.String() + " (commit " + buildversion.GitCommit() + ")")
log.Info("Built on " + buildversion.BuildDate())
certsDir := "../certs" certsDir := "../certs"
configDir := "../config" configDir := "../config"
dataDir := "../data" dataDir := "../data"
...@@ -125,14 +134,19 @@ func sanityChecks(c *Config) { ...@@ -125,14 +134,19 @@ func sanityChecks(c *Config) {
switch loglevelStr { switch loglevelStr {
case "debug": case "debug":
log.SetLevel(logrus.DebugLevel) log.SetLevel(logrus.DebugLevel)
log.Debug("Using DEBUG log level")
case "info": case "info":
log.SetLevel(logrus.InfoLevel) log.SetLevel(logrus.InfoLevel)
log.Info("Using INFO log level")
case "warn": case "warn":
log.SetLevel(logrus.WarnLevel) log.SetLevel(logrus.WarnLevel)
log.Warn("Using WARN log level")
case "error": case "error":
log.SetLevel(logrus.ErrorLevel) log.SetLevel(logrus.ErrorLevel)
log.Error("Using ERROR log level")
case "fatal": case "fatal":
log.SetLevel(logrus.FatalLevel) log.SetLevel(logrus.FatalLevel)
log.Fatal("Using debug log level")
default: default:
log.Fatal("Config file error: invalid \"log_level\" value") log.Fatal("Config file error: invalid \"log_level\" value")
} }
......
package main package main
import ( import (
"nexus-common/buildversion"
"nexus-server/cleaner" "nexus-server/cleaner"
"nexus-server/config" "nexus-server/config"
"nexus-server/exec" "nexus-server/exec"
...@@ -9,23 +8,13 @@ import ( ...@@ -9,23 +8,13 @@ import (
"nexus-server/router" "nexus-server/router"
"nexus-server/users" "nexus-server/users"
"nexus-server/utils" "nexus-server/utils"
"nexus-server/version"
"nexus-server/vms" "nexus-server/vms"
"os"
"path"
"github.com/sirupsen/logrus"
) )
var log = logger.GetInstance() var log = logger.GetInstance()
func main() { func main() {
log.SetLevel(logrus.InfoLevel) conf := config.GetInstance()
var appname = path.Base(os.Args[0])
serverVersion := version.Get()
log.Info(appname + " version " + serverVersion.String() + " (commit " + buildversion.GitCommit() + ")")
log.Info("Built on " + buildversion.BuildDate())
// Initialize the RNG' seed to the current time. // Initialize the RNG' seed to the current time.
utils.RandInit() utils.RandInit()
...@@ -58,7 +47,6 @@ func main() { ...@@ -58,7 +47,6 @@ func main() {
cleaner.Start() cleaner.Start()
conf := config.GetInstance()
log.Info("Using port range [", conf.Core.VMSpiceMinPort, "-", conf.Core.VMSpiceMaxPort, "]") log.Info("Using port range [", conf.Core.VMSpiceMinPort, "-", conf.Core.VMSpiceMaxPort, "]")
log.Info("Tmp directory: ", conf.Core.TmpDir) log.Info("Tmp directory: ", conf.Core.TmpDir)
......
...@@ -66,6 +66,7 @@ func InitTemplates() error { ...@@ -66,6 +66,7 @@ func InitTemplates() error {
continue continue
} }
log.Debug("Found template " + templateDir)
templates.m[templateDir] = template templates.m[templateDir] = template
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment