safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +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());
}

8
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingFilter.java
View File

@@ -115,7 +115,8 @@ public class AuthenticatingFilter implements Filter {
}
catch (GuacamoleException e) {
logger.error("Error reading Guacamole configuration.", e);
logger.error("Unable to read Guacamole configuration: {}", e.getMessage());
logger.debug("Error reading Guacamole configuration.", e);
throw new ServletException(e);
}
@@ -141,7 +142,7 @@ public class AuthenticatingFilter implements Filter {
((AuthenticationFailureListener) listener).authenticationFailed(event);
}
catch (GuacamoleException e) {
logger.error("Error notifying AuthenticationFailureListener.", e);
logger.debug("Error notifying AuthenticationFailureListener: {}", e);
}
}
@@ -382,7 +383,8 @@ public class AuthenticatingFilter implements Filter {
sendError(response, e.getStatus(), e.getMessage());
}
catch (GuacamoleException e) {
logger.error("Internal server error.", e);
logger.error("Authentication failed internally: {}", e.getMessage());
logger.debug("Internal server error.", e);
sendError(response, e.getStatus(), "Internal server error.");
}

3
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicTunnelRequestUtility.java
View File

@@ -164,7 +164,8 @@ public class BasicTunnelRequestUtility {
listeners = new SessionListenerCollection(httpSession);
}
catch (GuacamoleException e) {
logger.error("Failed to retrieve listeners. Authentication canceled.", e);
logger.error("Authentication canceled: failed to retrieve listeners: {}", e.getMessage());
logger.debug("Error retrieving listeners.", e);
throw e;
}

3
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/RestrictedHttpServlet.java
View File

@@ -126,7 +126,8 @@ public abstract class RestrictedHttpServlet extends HttpServlet {
sendError(response, e.getStatus(), e.getMessage());
}
catch (GuacamoleException e) {
logger.error("Internal server error.", e);
logger.error("Request failed: {}", e.getMessage());
logger.debug("Internal server error.", e);
sendError(response, e.getStatus(), "Internal server error.");
}

3
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/crud/protocols/List.java
View File

@@ -249,7 +249,8 @@ public class List extends RestrictedHttpServlet {
}
catch (IOException e) {
logger.error("Unable to read protocol XML.", e);
logger.error("Unable to read \"{}\": {}", file.getAbsolutePath(), e.getMessage());
logger.debug("Error reading protocol XML.", e);
}
}

12
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketSupportLoader.java
View File

@@ -85,7 +85,8 @@ public class WebSocketSupportLoader implements ServletContextListener {
// Log all GuacamoleExceptions
catch (GuacamoleException e) {
logger.error("Unable to load/detect WebSocket support.", e);
logger.error("Unable to load/detect WebSocket support: {}", e.getMessage());
logger.debug("Error loading/detecting WebSocket support.", e);
}
// JSR 356 not found
@@ -132,10 +133,12 @@ public class WebSocketSupportLoader implements ServletContextListener {
// Servlet API 3.0 found, but errors during use
catch (IllegalAccessException e) {
logger.error("Unable to load WebSocket tunnel servlet.", e);
logger.error("Unable to load WebSocket tunnel servlet: {}", e.getMessage());
logger.debug("Error loading WebSocket tunnel servlet.", e);
}
catch (InvocationTargetException e) {
logger.error("Internal error loading WebSocket tunnel servlet.", e);
logger.error("Unable to load WebSocket tunnel servlet: {}", e.getMessage());
logger.debug("Error loading WebSocket tunnel servlet.", e);
}
}
@@ -147,7 +150,8 @@ public class WebSocketSupportLoader implements ServletContextListener {
// Log all GuacamoleExceptions
catch (GuacamoleException e) {
logger.error("Unable to load/detect WebSocket support.", e);
logger.error("Unable to load/detect WebSocket support: {}", e.getMessage());
logger.debug("Error loading/detecting WebSocket support.", e);
}
// Load attempt failed

6
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
View File

@@ -79,7 +79,8 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
tunnel = doConnect(request);
}
catch (GuacamoleException e) {
logger.error("Error connecting WebSocket tunnel.", e);
logger.error("Connection failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e);
return null;
}
@@ -157,7 +158,8 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
closeConnection(connection, 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(connection, e.getStatus());
}

8
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
View File

@@ -75,7 +75,7 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
session.close(new CloseStatus(code, message));
}
catch (IOException e) {
logger.error("Unable to close WebSocket connection.", e);
logger.debug("Unable to close WebSocket connection.", e);
}
}
@@ -107,7 +107,8 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
}
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;
}
@@ -170,7 +171,8 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
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());
}

6
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
View File

@@ -99,7 +99,8 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
tunnel = doConnect(request);
}
catch (GuacamoleException e) {
logger.error("Error connecting WebSocket tunnel.", e);
logger.error("Connection failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e);
return null;
}
@@ -189,7 +190,8 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
closeConnection(outbound, 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(outbound, e.getStatus());
}