Explorar el Código

Change log level of meek payload I/O logs

- Reduce noise, since abrupt disconnections,
  which are common, typically result in
  network errors
- golang network error messages may contain
  client IP
Rod Hynes hace 9 años
padre
commit
e26611f5ce
Se han modificado 1 ficheros con 6 adiciones y 2 borrados
  1. 6 2
      psiphon/server/meek.go

+ 6 - 2
psiphon/server/meek.go

@@ -243,7 +243,9 @@ func (server *MeekServer) ServeHTTP(responseWriter http.ResponseWriter, request
 	err = session.clientConn.pumpReads(request.Body)
 	if err != nil {
 		if err != io.EOF {
-			log.WithContextFields(LogFields{"error": err}).Warning("pump reads failed")
+			// Debug since errors such as "i/o timeout" occur during normal operation;
+			// also, golang network error messages may contain client IP.
+			log.WithContextFields(LogFields{"error": err}).Debug("pump reads failed")
 		}
 		server.terminateConnection(responseWriter, request)
 		server.closeSession(sessionID)
@@ -266,7 +268,9 @@ func (server *MeekServer) ServeHTTP(responseWriter http.ResponseWriter, request
 	err = session.clientConn.pumpWrites(responseWriter)
 	if err != nil {
 		if err != io.EOF {
-			log.WithContextFields(LogFields{"error": err}).Warning("pump writes failed")
+			// Debug since errors such as "i/o timeout" occur during normal operation;
+			// also, golang network error messages may contain client IP.
+			log.WithContextFields(LogFields{"error": err}).Debug("pump writes failed")
 		}
 		server.terminateConnection(responseWriter, request)
 		server.closeSession(sessionID)