apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

client: jetty session timeout set after server is started (#3658)

Browse Source 
fixed inability to set a custom session duration via server.properties on mgmt server.
This commit is contained in:
Marc-Aurèle Brothier 2019-11-06 18:00:29 +01:00 committed by Daan Hoogland
parent 2ffc0c5073
commit 02714f263e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/main/java/org/apache/cloudstack/ServerDaemon.java
View File

@ -24,6 +24,7 @@ import java.lang.management.ManagementFactory;
import java.net.URL; import java.net.URL;
import java.util.Properties; import java.util.Properties;
import com.cloud.utils.Pair;
import org.apache.commons.daemon.Daemon; import org.apache.commons.daemon.Daemon;
import org.apache.commons.daemon.DaemonContext; import org.apache.commons.daemon.DaemonContext;
import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.jmx.MBeanContainer;
@ -40,6 +41,7 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.MovedContextHandler; import org.eclipse.jetty.server.handler.MovedContextHandler;
import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.server.handler.RequestLogHandler;
import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
@ -175,7 +177,8 @@ public class ServerDaemon implements Daemon {
createHttpConnector(httpConfig); createHttpConnector(httpConfig);
// Setup handlers // Setup handlers
server.setHandler(createHandlers()); Pair<SessionHandler,HandlerCollection> pair = createHandlers();
server.setHandler(pair.second());
// Extra config options // Extra config options
server.setStopAtShutdown(true); server.setStopAtShutdown(true);
@ -184,6 +187,8 @@ public class ServerDaemon implements Daemon {
createHttpsConnector(httpConfig); createHttpsConnector(httpConfig);
server.start(); server.start();
// Must set the session timeout after the server has started
pair.first().setMaxInactiveInterval(sessionTimeout * 60);
server.join(); server.join();
} }
@ -236,11 +241,10 @@ public class ServerDaemon implements Daemon {
} }
} }
private HandlerCollection createHandlers() { private Pair<SessionHandler,HandlerCollection> createHandlers() {
final WebAppContext webApp = new WebAppContext(); final WebAppContext webApp = new WebAppContext();
webApp.setContextPath(contextPath); webApp.setContextPath(contextPath);
webApp.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false"); webApp.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
webApp.getSessionHandler().setMaxInactiveInterval(sessionTimeout * 60);
// GZIP handler // GZIP handler
final GzipHandler gzipHandler = new GzipHandler(); final GzipHandler gzipHandler = new GzipHandler();
@ -259,14 +263,14 @@ public class ServerDaemon implements Daemon {
final RequestLogHandler log = new RequestLogHandler(); final RequestLogHandler log = new RequestLogHandler();
log.setRequestLog(createRequestLog()); log.setRequestLog(createRequestLog());
// Redirect root context handler // Redirect root context handler_war
MovedContextHandler rootRedirect = new MovedContextHandler(); MovedContextHandler rootRedirect = new MovedContextHandler();
rootRedirect.setContextPath("/"); rootRedirect.setContextPath("/");
rootRedirect.setNewContextURL(contextPath); rootRedirect.setNewContextURL(contextPath);
rootRedirect.setPermanent(true); rootRedirect.setPermanent(true);
// Put rootRedirect at the end! // Put rootRedirect at the end!
return new HandlerCollection(log, gzipHandler, rootRedirect); return new Pair<>(webApp.getSessionHandler(), new HandlerCollection(log, gzipHandler, rootRedirect));
} }
private RequestLog createRequestLog() { private RequestLog createRequestLog() {