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-997 runtime product configuration file support

Browse Source
This commit is contained in:
Serge Rider
2021-05-25 15:34:24 +03:00
parent e7d1ddff60
commit d720a35abf
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+23 -5
View File
@@ -174,7 +174,7 @@ public class CBApplication extends BaseApplicationImpl {
try {
loadConfiguration(configPath);
File runtimeConfigFile = getRuntimeConfigFile();
File runtimeConfigFile = getRuntimeAppConfigFile();
if (runtimeConfigFile.exists()) {
log.debug("Runtime configuration [" + runtimeConfigFile.getAbsolutePath() + "]");
parseConfiguration(runtimeConfigFile);
@@ -327,8 +327,13 @@ public class CBApplication extends BaseApplicationImpl {
}
@NotNull
private File getRuntimeConfigFile() {
return new File(getDataDirectory(false), CBConstants.RUNTIME_CONFIG_FILE_NAME);
private File getRuntimeAppConfigFile() {
return new File(getDataDirectory(false), CBConstants.RUNTIME_APP_CONFIG_FILE_NAME);
}
@NotNull
private File getRuntimeProductConfigFile() {
return new File(getDataDirectory(false), CBConstants.RUNTIME_PRODUCT_CONFIG_FILE_NAME);
}
@NotNull
@@ -439,6 +444,19 @@ public class CBApplication extends BaseApplicationImpl {
}
}
}
// Add product config from runtime
{
File rtConfig = getRuntimeProductConfigFile();
if (rtConfig.exists()) {
log.debug("Load product runtime configuration from '" + rtConfig.getAbsolutePath() + "'");
try (Reader reader = new InputStreamReader(new FileInputStream(rtConfig), StandardCharsets.UTF_8)) {
productConfiguration.putAll(JSONUtils.parseMap(gson, reader));
} catch (Exception e) {
log.error("Error reading product runtime configuration", e);
}
}
}
}
static String getRelativePath(String path, String curDir) {
@@ -530,7 +548,7 @@ public class CBApplication extends BaseApplicationImpl {
// Re-load runtime configuration
try {
log.debug("Reloading application configuration");
File runtimeConfigFile = getRuntimeConfigFile();
File runtimeConfigFile = getRuntimeAppConfigFile();
if (runtimeConfigFile.exists()) {
log.debug("Runtime configuration [" + runtimeConfigFile.getAbsolutePath() + "]");
parseConfiguration(runtimeConfigFile);
@@ -567,7 +585,7 @@ public class CBApplication extends BaseApplicationImpl {
private void saveRuntimeConfig(String newServerName, long sessionExpireTime, CBAppConfig appConfig) throws DBException {
File runtimeConfigFile = getRuntimeConfigFile();
File runtimeConfigFile = getRuntimeAppConfigFile();
try (Writer out = new OutputStreamWriter(new FileOutputStream(runtimeConfigFile), StandardCharsets.UTF_8)) {
Gson gson = new GsonBuilder()
.setLenient()
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBConstants.java
+2 -1
View File
@@ -30,7 +30,8 @@ public class CBConstants {
public static final String DEFAULT_CONFIG_FILE_PATH = "/etc/cloudbeaver.conf";
public static final String RUNTIME_DATA_DIR_NAME = ".data";
public static final String RUNTIME_CONFIG_FILE_NAME = ".cloudbeaver.runtime.conf";
public static final String RUNTIME_APP_CONFIG_FILE_NAME = ".cloudbeaver.runtime.conf";
public static final String RUNTIME_PRODUCT_CONFIG_FILE_NAME = ".product.runtime.conf";
public static final String CLI_PARAM_WEB_CONFIG = "-web-config";