From 5e10aeefb60b1db581c26da81ad41b73f1baa1c2 Mon Sep 17 00:00:00 2001 From: yagudin10 Date: Fri, 12 Aug 2022 10:53:20 +0300 Subject: [PATCH] CB-2268 web session update session idle time --- .../io/cloudbeaver/service/core/impl/WebServiceCore.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java index 0b9064d3e4..ef1ea1f15b 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java @@ -21,9 +21,12 @@ import io.cloudbeaver.DBWConstants; import io.cloudbeaver.DBWebException; import io.cloudbeaver.WebServiceUtils; import io.cloudbeaver.model.*; +import io.cloudbeaver.model.app.BaseWebApplication; +import io.cloudbeaver.model.app.WebAppConfiguration; import io.cloudbeaver.model.session.WebSession; import io.cloudbeaver.registry.WebHandlerRegistry; import io.cloudbeaver.registry.WebSessionHandlerDescriptor; +import io.cloudbeaver.server.CBAppConfig; import io.cloudbeaver.server.CBApplication; import io.cloudbeaver.server.CBPlatform; import io.cloudbeaver.service.core.DBWServiceCore; @@ -52,6 +55,7 @@ import org.jkiss.dbeaver.registry.DataSourceDescriptor; import org.jkiss.dbeaver.registry.DataSourceProviderRegistry; import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor; import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry; +import org.jkiss.dbeaver.runtime.DBWorkbench; import org.jkiss.dbeaver.runtime.jobs.ConnectionTestJob; import org.jkiss.dbeaver.utils.RuntimeUtils; import org.jkiss.utils.CommonUtils; @@ -203,6 +207,8 @@ public class WebServiceCore implements DBWServiceCore { @Override public WebSession getSessionState(@NotNull WebSession webSession) { + long maxSessionIdleTime = CBApplication.getInstance().getMaxSessionIdleTime(); + webSession.setMaxSessionIdleTime(maxSessionIdleTime == 0 ? Long.MAX_VALUE : maxSessionIdleTime); return webSession; }