Handle logging of dynamic env depending on log status

Signed-off-by: Łukasz Gryglicki <[email protected]>

context.go

@@ -184,7 +184,7 @@ func (ctx *Ctx) SetCPUs() {
 func (ctx *Ctx) Init() {
 	// Initialize env syncer once
 	syncerOnce.Do(func() {
-		UpdateEnv()
+		UpdateEnv(false)
 		go EnvSyncer()
 	})
 	ctx.ExecFatal = true

env.go

@@ -15,12 +15,12 @@ var gEnvMap map[string]string = make(map[string]string)
 func EnvSyncer() {
 	for {
 		time.Sleep(30 * time.Second)
-		UpdateEnv()
+		UpdateEnv(true)
 	}
 }
 
 // UpdateEnv - update (eventually) env using env.env file
-func UpdateEnv() {
+func UpdateEnv(useLog bool) {
 	ef, err := os.Open("env.env")
 	if err != nil {
 		return
@@ -42,7 +42,13 @@ func UpdateEnv() {
 		os.Setenv(k, v)
 		cv, ok := gEnvMap[k]
 		if !ok || cv != v {
-			fmt.Printf("new environment overwrite: '%s' --> '%s'\n", k, v)
+			if useLog {
+				if IsLogInitialized() {
+					Printf("new environment overwrite: '%s' --> '%s'\n", k, v)
+				}
+			} else {
+				fmt.Printf("new environment overwrite: '%s' --> '%s'\n", k, v)
+			}
 		}
 		gEnvMap[k] = v
 	}

log.go

@@ -23,13 +23,15 @@ type logContext struct {
 // This variable is initialized *only* once, and must be guared by the mutex
 // to avoid initializing it from multiple go routines
 var (
-	logCtx      *logContext
-	logCtxMutex sync.RWMutex
-	logOnce     sync.Once
-	BuildStamp  = "None"
-	GitHash     = "None"
-	HostName    = "None"
-	GoVersion   = "None"
+	logCtx         *logContext
+	logCtxMutex    sync.RWMutex
+	logOnce        sync.Once
+	logInitialized = false
+	logInitMtx     sync.Mutex
+	BuildStamp     = "None"
+	GitHash        = "None"
+	HostName       = "None"
+	GoVersion      = "None"
 )
 
 // Returns new context when not yet created
@@ -52,6 +54,11 @@ func newLogContext() *logContext {
 		now,
 		info,
 	)
+	defer func() {
+		logInitMtx.Lock()
+		logInitialized = true
+		logInitMtx.Unlock()
+	}()
 	return &logContext{
 		ctx:   ctx,
 		con:   con,
@@ -108,6 +115,13 @@ func Printf(format string, args ...interface{}) (n int, err error) {
 	return
 }
 
+// IsLogInitialized - check if log is initialized
+func IsLogInitialized() bool {
+	logInitMtx.Lock()
+	defer logInitMtx.Unlock()
+	return logInitialized
+}
+
 // ClearDBLogs clears logs older by defined period (in context.go)
 // It clears logs on `devstats` database
 func ClearDBLogs() {