Эх сурвалжийг харах

Fix: call psiphon.NoticeBuildInfo _after_ LoadConfig

Rod Hynes 8 жил өмнө
parent
commit
9b1a737a3e
1 өөрчлөгдсөн 8 нэмэгдсэн , 2 устгасан
  1. 8 2
      ConsoleClient/main.go

+ 8 - 2
ConsoleClient/main.go

@@ -163,10 +163,11 @@ func main() {
 		os.Exit(1)
 	}
 
-	psiphon.NoticeBuildInfo()
-
 	// Handle required config file parameter
 
+	// EmitDiagnosticNotices is set by LoadConfig; force to true
+	// an emit diagnostics when LoadConfig-related errors occur.
+
 	if configFilename == "" {
 		psiphon.SetEmitDiagnosticNotices(true)
 		psiphon.NoticeError("configuration file is required")
@@ -185,6 +186,11 @@ func main() {
 		os.Exit(1)
 	}
 
+	// BuildInfo is a diagnostic notice, so emit only after LoadConfig
+	// sets EmitDiagnosticNotices.
+
+	psiphon.NoticeBuildInfo()
+
 	// Handle optional profiling parameter
 
 	if profileFilename != "" {