Don't log regexes; do log more info about port forward errors

psiphon/conn.go

@@ -118,12 +118,12 @@ func Relay(localConn, remoteConn net.Conn) {
 		defer copyWaitGroup.Done()
 		_, err := io.Copy(localConn, remoteConn)
 		if err != nil {
-			Notice(NOTICE_ALERT, "%s", ContextError(err))
+			Notice(NOTICE_ALERT, "Relay failed: %s", ContextError(err))
 		}
 	}()
 	_, err := io.Copy(remoteConn, localConn)
 	if err != nil {
-		Notice(NOTICE_ALERT, "%s", ContextError(err))
+		Notice(NOTICE_ALERT, "Relay failed: %s", ContextError(err))
 	}
 	copyWaitGroup.Wait()
 }

psiphon/controller.go

@@ -380,6 +380,9 @@ func (controller *Controller) operateTunnel(tunnel *Tunnel) {
 		select {
 		case failures := <-tunnel.portForwardFailures:
 			tunnel.portForwardFailureTotal += failures
+			Notice(
+				NOTICE_INFO, "port forward failures for %s: %d",
+				tunnel.serverEntry.IpAddress, tunnel.portForwardFailureTotal)
 			if tunnel.portForwardFailureTotal > controller.config.PortForwardFailureThreshold {
 				err = errors.New("tunnel exceeded port forward failure threshold")
 			}

psiphon/serverApi.go

@@ -141,12 +141,15 @@ func (session *Session) doHandshakeRequest() error {
 	if upgradeClientVersion > session.config.ClientVersion {
 		Notice(NOTICE_UPGRADE, "%d", upgradeClientVersion)
 	}
-	for _, pageViewRegex := range handshakeConfig.PageViewRegexes {
-		Notice(NOTICE_PAGE_VIEW_REGEX, "%s %s", pageViewRegex["regex"], pageViewRegex["replace"])
-	}
-	for _, httpsRequestRegex := range handshakeConfig.HttpsRequestRegexes {
-		Notice(NOTICE_HTTPS_REGEX, "%s %s", httpsRequestRegex["regex"], httpsRequestRegex["replace"])
-	}
+	// TODO: remove regex notices -- regexes will be used internally
+	/*
+		for _, pageViewRegex := range handshakeConfig.PageViewRegexes {
+			Notice(NOTICE_PAGE_VIEW_REGEX, "%s %s", pageViewRegex["regex"], pageViewRegex["replace"])
+		}
+		for _, httpsRequestRegex := range handshakeConfig.HttpsRequestRegexes {
+			Notice(NOTICE_HTTPS_REGEX, "%s %s", httpsRequestRegex["regex"], httpsRequestRegex["replace"])
+		}
+	*/
 	return nil
 }