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

GUAC-915: Clean up all log messages within Guacamole.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-30 17:12:54 -07:00
parent 4a5efe4819
commit 48382b8285
17 changed files with 93 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,7 +417,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
}
catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection closed.", e);
logger.debug("Connection to guacd closed.", e);
}
catch (IOException e) {

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

@@ -119,7 +119,7 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
}
catch (GuacamoleException e) {
logger.error("Connection failed: {}", e.getMessage());
logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e);
closeConnection(session, e.getStatus());
return;
@@ -177,16 +177,17 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
// to pass within the WebSocket connection, logging
// each error appropriately.
catch (GuacamoleClientException e) {
logger.warn("Client request rejected: {}", e.getMessage());
logger.info("WebSocket connection terminated: {}", e.getMessage());
logger.debug("WebSocket connection terminated due to client error.", e);
closeConnection(session, e.getStatus());
}
catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection closed.", e);
logger.debug("Connection to guacd closed.", e);
closeConnection(session, GuacamoleStatus.SUCCESS);
}
catch (GuacamoleException e) {
logger.error("Connection terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection.", e);
logger.error("Connection to guacd terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection to guacd.", e);
closeConnection(session, e.getStatus());
}
@@ -213,10 +214,10 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
writer.write(message.toCharArray());
}
catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection closed.", e);
logger.debug("Connection to guacd closed.", e);
}
catch (GuacamoleException e) {
logger.debug("Tunnel write failed.", e);
logger.debug("WebSocket tunnel write failed.", e);
}
tunnel.releaseWriter();