safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-909: Log full exceptions only in debug level. Rephrase log messages.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-27 13:03:20 -07:00
parent 770105de06
commit 6f81584aed
10 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
View File

@@ -206,11 +206,12 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
// Catch any thrown guacamole exception and attempt to pass within the
// HTTP response, logging each error appropriately.
catch (GuacamoleClientException e) {
logger.warn("Client request rejected: {}", e.getMessage());
logger.warn("HTTP tunnel request rejected: {}", e.getMessage());
sendError(response, e.getStatus(), e.getMessage());
}
catch (GuacamoleException e) {
logger.error("Internal server error.", e);
logger.error("HTTP tunnel request failed: {}", e.getMessage());
logger.debug("Internal error in HTTP tunnel.", e);
sendError(response, e.getStatus(), "Internal server error.");
}

8
guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
View File

@@ -84,7 +84,7 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
session.close(new CloseReason(code, message));
}
catch (IOException e) {
logger.error("Unable to close WebSocket connection.", e);
logger.debug("Unable to close WebSocket connection.", e);
}
}
@@ -119,7 +119,8 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
}
catch (GuacamoleException e) {
logger.error("Error connecting WebSocket tunnel.", e);
logger.error("Connection failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e);
closeConnection(session, e.getStatus());
return;
}
@@ -184,7 +185,8 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
closeConnection(session, GuacamoleStatus.SUCCESS);
}
catch (GuacamoleException e) {
logger.error("Internal server error.", e);
logger.error("Connection terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection.", e);
closeConnection(session, e.getStatus());
}