close log file handles when applying a configuration change

we were leaking descriptors.
gustavo-iniguez-goya · Nov 2, 2020 · aad69e9 · aad69e9
1 parent ff5c1ff
commit aad69e9
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/daemon/ui/config.go b/daemon/ui/config.go
@@ -68,13 +68,17 @@ func (c *Client) loadConfiguration(rawConfig []byte) bool {
 	defer config.Unlock()
 
 	if err := json.Unmarshal(rawConfig, &config); err != nil {
-		fmt.Errorf("Error parsing configuration %s: %s", configFile, err)
+		log.Error("Error parsing configuration %s: %s", configFile, err)
 		return false
 	}
 	// firstly load config level, to detect further errors if any
 	if config.LogLevel != nil {
 		log.SetLogLevel(int(*config.LogLevel))
 	}
+	if config.Server.LogFile != "" {
+		log.Close()
+		log.OpenFile(config.Server.LogFile)
+	}
 
 	if config.Server.Address != "" {
 		tempSocketPath := c.getSocketPath(config.Server.Address)
@@ -84,12 +88,6 @@ func (c *Client) loadConfiguration(rawConfig []byte) bool {
 		}
 		c.setSocketPath(tempSocketPath)
 	}
-	if config.Server.LogFile != "" {
-		if err := log.OpenFile(config.Server.LogFile); err != nil {
-			log.Warning("Error opening log file: ", err)
-		}
-	}
-
 	if config.DefaultAction != "" {
 		clientDisconnectedRule.Action = rule.Action(config.DefaultAction)
 		clientErrorRule.Action = rule.Action(config.DefaultAction)