opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-3071 easy config send event fix (#1683)

Browse Source
This commit is contained in:
Ainur
2023-05-23 14:10:04 +03:00
committed by GitHub
parent 86302cfdde
commit d888549bec
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+8 -5
View File
@@ -240,6 +240,8 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
configurationMode = CommonUtils.isEmpty(serverName);
eventController.setForceSkipEvents(isConfigurationMode()); // do not send events if configuration mode is on
// Determine address for local host
localHostAddress = System.getenv(CBConstants.VAR_CB_LOCAL_HOST_ADDR);
if (CommonUtils.isEmpty(localHostAddress)) {
@@ -807,11 +809,6 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
configurationMode = CommonUtils.isEmpty(serverName);
String sessionId = null;
if (credentialsProvider != null && credentialsProvider.getActiveUserCredentials() != null) {
sessionId = credentialsProvider.getActiveUserCredentials().getSmSessionId();
}
// Reloading configuration by services
for (DBWServiceServerConfigurator wsc : WebServiceRegistry.getInstance().getWebServices(DBWServiceServerConfigurator.class)) {
try {
@@ -820,7 +817,13 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
log.warn("Error reloading configuration by web service " + wsc.getClass().getName(), e);
}
}
String sessionId = null;
if (credentialsProvider != null && credentialsProvider.getActiveUserCredentials() != null) {
sessionId = credentialsProvider.getActiveUserCredentials().getSmSessionId();
}
eventController.addEvent(new WSServerConfigurationChangedEvent(sessionId, null));
eventController.setForceSkipEvents(isConfigurationMode());
}
protected Map<String, Object> readRuntimeConfigurationProperties() throws DBException {