Parcourir la source

Fix: close files before reopening

Rod Hynes il y a 8 ans
Parent
commit
1e61af01dc
1 fichiers modifiés avec 6 ajouts et 0 suppressions
  1. 6 0
      psiphon/notice.go

+ 6 - 0
psiphon/notice.go

@@ -122,6 +122,9 @@ func SetNoticeOutput(
 
 
 	if homepageFilename != "" {
 	if homepageFilename != "" {
 		var err error
 		var err error
+		if singletonNoticeLogger.homepageFile != nil {
+			singletonNoticeLogger.homepageFile.Close()
+		}
 		singletonNoticeLogger.homepageFile, err = os.OpenFile(
 		singletonNoticeLogger.homepageFile, err = os.OpenFile(
 			homepageFilename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
 			homepageFilename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
 		if err != nil {
 		if err != nil {
@@ -131,6 +134,9 @@ func SetNoticeOutput(
 
 
 	if rotatingFilename != "" {
 	if rotatingFilename != "" {
 		var err error
 		var err error
+		if singletonNoticeLogger.rotatingFile != nil {
+			singletonNoticeLogger.rotatingFile.Close()
+		}
 		singletonNoticeLogger.rotatingFile, err = os.OpenFile(
 		singletonNoticeLogger.rotatingFile, err = os.OpenFile(
 			rotatingFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
 			rotatingFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
 		if err != nil {
 		if err != nil {