Alon Bar-Lev has uploaded a new change for review. Change subject: tools: engine-config: have it respect runtime and build time configuration ......................................................................
tools: engine-config: have it respect runtime and build time configuration remove search for config in current working directory as it is non-standard, and should not exist in application. Change-Id: I895c90eef08ea368cda84df892518555d8f38528 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/KeysConfig.java 3 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/14778/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java index e149b2f..4902e9b 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/AppConfig.java @@ -8,11 +8,11 @@ public class AppConfig<T extends PropertiesConfiguration> extends ConfigFile<T> { - private static final String RHEV_CONFIG_CONF = "engine-config.conf"; + private static final String CONFIG_CONF = "engine-config.conf"; private PropertiesConfiguration configFile; private final String[] defaultFileLocations = new String[] { - System.getenv("PWD") + File.separator + RHEV_CONFIG_CONF, - EngineConfig.DEFAULT_CONFIG_PATH + RHEV_CONFIG_CONF }; + new File(EngineConfig.DEFAULT_CONFIG_PATH, CONFIG_CONF).getAbsolutePath() + }; public AppConfig(String optionalConfigDir) throws FileNotFoundException, ConfigurationException { File file = locate(optionalConfigDir); @@ -26,6 +26,6 @@ @Override protected String[] getDefaultFileLocations() { - return defaultFileLocations; + return new String[] {new File(EngineConfig.DEFAULT_CONFIG_PATH, CONFIG_CONF).getAbsolutePath()}; } } diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java index fd5e736..c3b35bb 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java @@ -1,8 +1,11 @@ package org.ovirt.engine.core.config; +import java.io.File; + import org.apache.log4j.Logger; import org.ovirt.engine.core.config.validation.ConfigActionType; import org.ovirt.engine.core.tools.ToolConsole; +import org.ovirt.engine.core.utils.EngineLocalConfig; /** * The <code>EngineConfig</code> class represents the main class of the EngineConfig tool. @@ -15,7 +18,7 @@ private static final ToolConsole console = ToolConsole.getInstance(); public static final String CONFIG_FILE_PATH_PROPERTY = "engine-config.config.file.path"; - public static final String DEFAULT_CONFIG_PATH = "/etc/ovirt-engine/engine-config/"; + public static final File DEFAULT_CONFIG_PATH = new File(EngineLocalConfig.getInstance().getEtcDir(), "engine-config"); private EngineConfigCLIParser parser; private EngineConfigLogic engineConfigLogic; private static EngineConfig instance = new EngineConfig(); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/KeysConfig.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/KeysConfig.java index 05c491f..94d9c1f 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/KeysConfig.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/KeysConfig.java @@ -16,13 +16,10 @@ private static final String RHEV_CONFIG_PROPERTIES = "engine-config.properties"; private T configFile; - private final String pwd = System.getenv("PWD").toString() + File.separator; - private final Locale locale = Locale.getDefault(); private final String[] defaultFileLocations = { - pwd + RHEV_CONFIG_PROPERTIES, - pwd + "engine-config_" + locale + ".properties", - DEFAULT_CONFIG_PATH + RHEV_CONFIG_PROPERTIES, - DEFAULT_CONFIG_PATH + "engine-config_" + locale + ".properties" }; + new File(DEFAULT_CONFIG_PATH, RHEV_CONFIG_PROPERTIES).getAbsolutePath(), + new File(DEFAULT_CONFIG_PATH, "engine-config_" + Locale.getDefault() + ".properties").getAbsolutePath() + }; public KeysConfig(String optionalConfigPath) throws FileNotFoundException, ConfigurationException { File file = locate(optionalConfigPath); -- To view, visit http://gerrit.ovirt.org/14778 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I895c90eef08ea368cda84df892518555d8f38528 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
