Add NoticeEstablishTunnelTimeout

psiphon/controller.go

@@ -385,7 +385,7 @@ func (controller *Controller) establishTunnelWatcher() {
 		select {
 		case <-timer.C:
 			if !controller.hasEstablishedOnce() {
-				NoticeAlert("failed to establish tunnel before timeout")
+				NoticeEstablishTunnelTimeout(timeout)
 				controller.SignalComponentFailure()
 			}
 		case <-controller.runCtx.Done():

psiphon/notice.go

@@ -766,6 +766,14 @@ func NoticeLivenessTest(ipAddress string, metrics *livenessTestMetrics, success
 		"success", success)
 }
 
+// NoticeEstablishTunnelTimeout reports that the configured EstablishTunnelTimeout
+// duration was exceeded.
+func NoticeEstablishTunnelTimeout(timeout time.Duration) {
+	singletonNoticeLogger.outputNotice(
+		"EstablishTunnelTimeout", noticeShowUser,
+		"timeout", timeout)
+}
+
 type repetitiveNoticeState struct {
 	message string
 	repeats int