Merge pull request #165 from adam-p/master

Add NoticeExiting to indicate when tunnel-core is exiting

psiphon/controller.go

@@ -229,6 +229,8 @@ func (controller *Controller) Run(shutdownBroadcast <-chan struct{}) {
 	controller.splitTunnelClassifier.Shutdown()
 
 	NoticeInfo("exiting controller")
+
+	NoticeExiting()
 }
 
 // SignalComponentFailure notifies the controller that an associated component has failed.

psiphon/notice.go

@@ -302,7 +302,7 @@ func NoticeLocalProxyError(proxyType string, err error) {
 
 // NoticeConnectedMeekStats reports extra network details for a meek tunnel connection.
 func NoticeConnectedMeekStats(ipAddress string, meekStats *MeekStats) {
-	outputNotice("NoticeConnectedMeekStats", true, false,
+	outputNotice("ConnectedMeekStats", true, false,
 		"ipAddress", ipAddress,
 		"dialAddress", meekStats.DialAddress,
 		"resolvedIPAddress", meekStats.ResolvedIPAddress,
@@ -313,7 +313,7 @@ func NoticeConnectedMeekStats(ipAddress string, meekStats *MeekStats) {
 
 // NoticeBuildInfo reports build version info.
 func NoticeBuildInfo(buildDate, buildRepo, buildRev, goVersion, gomobileVersion string) {
-	outputNotice("NoticeBuildInfo", false, false,
+	outputNotice("BuildInfo", false, false,
 		"buildDate", buildDate,
 		"buildRepo", buildRepo,
 		"buildRev", buildRev,
@@ -321,6 +321,11 @@ func NoticeBuildInfo(buildDate, buildRepo, buildRev, goVersion, gomobileVersion
 		"gomobileVersion", gomobileVersion)
 }
 
+// NoticeExiting indicates that tunnel-core is exiting imminently.
+func NoticeExiting() {
+	outputNotice("Exiting", false, true)
+}
+
 type repetitiveNoticeState struct {
 	message string
 	repeats int