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

GUAC-442: Remove enable-websocket property (enable by default).

Browse Source
This commit is contained in:
Michael Jumper
2014-10-09 21:24:08 -07:00
parent b7548675df
commit d3e625d0a3
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,18 +62,8 @@ public class WebSocketSupportLoader implements ServletContextListener {
/** /**
* Logger for this class. * Logger for this class.
*/ */
private Logger logger = LoggerFactory.getLogger(WebSocketSupportLoader.class); private final Logger logger = LoggerFactory.getLogger(WebSocketSupportLoader.class);
private static final BooleanGuacamoleProperty ENABLE_WEBSOCKET =
new BooleanGuacamoleProperty() {
@Override
public String getName() {
return "enable-websocket";
}
};
/** /**
* Classname of the Jetty-specific WebSocket tunnel implementation. * Classname of the Jetty-specific WebSocket tunnel implementation.
*/ */
@@ -134,13 +124,10 @@ public class WebSocketSupportLoader implements ServletContextListener {
} }
// If no such servlet class, WebSocket support not present // If no such servlet class, this particular WebSocket support
catch (ClassNotFoundException e) { // is not present
logger.info("WebSocket support not found."); catch (ClassNotFoundException e) {}
} catch (NoClassDefFoundError e) {}
catch (NoClassDefFoundError e) {
logger.info("WebSocket support not found.");
}
// Log all GuacamoleExceptions // Log all GuacamoleExceptions
catch (GuacamoleException e) { catch (GuacamoleException e) {
@@ -159,31 +146,12 @@ public class WebSocketSupportLoader implements ServletContextListener {
@Override @Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
try {
// Stop if WebSocket not explicitly enabled.
if (!GuacamoleProperties.getProperty(ENABLE_WEBSOCKET, false)) {
logger.info("WebSocket support not enabled.");
return;
}
}
catch (GuacamoleException e) {
logger.error("Error parsing enable-websocket property.", e);
}
// Try to load websocket support for Jetty // Try to load websocket support for Jetty
logger.info("Attempting to load Jetty-specific WebSocket support...");
if (loadWebSocketTunnel(sce.getServletContext(), JETTY_WEBSOCKET)) if (loadWebSocketTunnel(sce.getServletContext(), JETTY_WEBSOCKET))
return; return;
// Try to load websocket support for Tomcat // Failing that, try to load websocket support for Tomcat
logger.info("Attempting to load Tomcat-specific WebSocket support..."); loadWebSocketTunnel(sce.getServletContext(), TOMCAT_WEBSOCKET);
if (loadWebSocketTunnel(sce.getServletContext(), TOMCAT_WEBSOCKET))
return;
// Inform of lack of support
logger.info("No WebSocket support could be loaded. Only HTTP will be used.");
} }