Move closing the default logger after printing configuration errors

ptrcnull · foxcpp · commit c9c856ffb6fb · 2022-04-24T21:46:30.000+03:00
diff --git a/maddy.go b/maddy.go
@@ -161,6 +161,8 @@ func Run() int {
 		return 2
 	}
 
+	defer log.DefaultLogger.Out.Close()
+
 	if err := moduleMain(cfg); err != nil {
 		systemdStatusErr(err)
 		log.Println(err)
@@ -271,8 +273,6 @@ func moduleMain(cfg []config.Node) error {
 		return err
 	}
 
-	defer log.DefaultLogger.Out.Close()
-
 	hooks.AddHook(hooks.EventLogRotate, reinitLogging)
 
 	endpoints, mods, err := RegisterModules(globals, modBlocks)

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,8 @@ func Run() int {`
`161`	`161`	`return 2`
`162`	`162`	`}`
`163`	`163`
	`164`	`+ defer log.DefaultLogger.Out.Close()`
	`165`	`+`
`164`	`166`	`if err := moduleMain(cfg); err != nil {`
`165`	`167`	`systemdStatusErr(err)`
`166`	`168`	`log.Println(err)`
`@@ -271,8 +273,6 @@ func moduleMain(cfg []config.Node) error {`
`271`	`273`	`return err`
`272`	`274`	`}`
`273`	`275`
`274`		`- defer log.DefaultLogger.Out.Close()`
`275`		`-`
`276`	`276`	`hooks.AddHook(hooks.EventLogRotate, reinitLogging)`
`277`	`277`
`278`	`278`	`endpoints, mods, err := RegisterModules(globals, modBlocks)`