Martin Peřina has uploaded a new change for review. Change subject: tools: Remove --log4j-config param from engine-config ......................................................................
tools: Remove --log4j-config param from engine-config Removes --log4j-config param from engine-config. It's not needed anymore, because custom logging configuration can be specified using OVIRT_LOGGING_PROPERTIES environment variable. Change-Id: Ic9bc5019a7bec898500d4a5c562771d2809cd6b1 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigCLIParser.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigMap.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/OptionKey.java M packaging/bin/engine-config.sh M packaging/man/man8/engine-config.8 5 files changed, 11 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/33758/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigCLIParser.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigCLIParser.java index cb1505d..164137d 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigCLIParser.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigCLIParser.java @@ -260,7 +260,6 @@ engineConfigMap.setOnlyReloadable(parseOptionKey(OptionKey.OPTION_ONLY_RELOADABLE)); engineConfigMap.setLogFile(parseOptionKey(OptionKey.OPTION_LOG_FILE)); engineConfigMap.setLogLevel(parseOptionKey(OptionKey.OPTION_LOG_LEVEL)); - engineConfigMap.setLog4jConfig(parseOptionKey(OptionKey.OPTION_LOG4J_CONFIG)); } public EngineConfigMap getEngineConfigMap() { diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigMap.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigMap.java index 204103d..a5cd7e6 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigMap.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigMap.java @@ -18,7 +18,6 @@ private boolean onlyReloadable; private String logFile; private String logLevel; - private String log4jConfig; public boolean isOnlyReloadable() { return onlyReloadable; @@ -111,14 +110,6 @@ this.logLevel = logLevel; } - public String getLog4jConfig() { - return log4jConfig; - } - - public void setLog4jConfig(String log4jConfig) { - this.log4jConfig = log4jConfig; - } - @Override public String toString() { final String SEPARATOR = ", "; @@ -134,7 +125,6 @@ .append("alternatePropertiesFile = ").append(this.alternatePropertiesFile).append(SEPARATOR) .append("logFile = ").append(this.logFile).append(SEPARATOR) .append("logLevel = ").append(this.logLevel).append(SEPARATOR) - .append("log4jConfig = ").append(this.log4jConfig).append(SEPARATOR) .append(" )"); return retValue.toString(); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/OptionKey.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/OptionKey.java index 2056a86..7d255ad 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/OptionKey.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/OptionKey.java @@ -15,8 +15,7 @@ OPTION_ADMINPASSFILE(Arrays.asList(new String[] { "--admin-pass-file" })), OPTION_ONLY_RELOADABLE(Arrays.asList(new String[] { "-o", "--only-reloadable" })), OPTION_LOG_FILE(Arrays.asList(new String[] { "--log-file" })), - OPTION_LOG_LEVEL(Arrays.asList(new String[] { "--log-level" })), - OPTION_LOG4J_CONFIG(Arrays.asList(new String[] { "--log4j-config" })); + OPTION_LOG_LEVEL(Arrays.asList(new String[] { "--log-level" })); private List<String> optionalStrings; diff --git a/packaging/bin/engine-config.sh b/packaging/bin/engine-config.sh index a26bdb2..d322c15 100755 --- a/packaging/bin/engine-config.sh +++ b/packaging/bin/engine-config.sh @@ -46,9 +46,6 @@ --log-level=LOG_LEVEL Sets log level, one of DEBUG (default), INFO, WARN, ERROR (case insensitive). - --log4j-config=XML_FILE - Sets log4j.xml file which logging configuration is loaded from. - SETTING PASSWORDS Passwords can be set in interactive mode: @@ -61,6 +58,10 @@ PasswordEntry varies between the different password options. +CUSTOM LOGGING + If you need custom logging setup, please create your own java.util.logging properties file, + set a path to this file into OVIRT_LOGGING_PROPERTIES environment variable and execute engine-config. + NOTE In order for your change(s) to take effect, restart the oVirt engine. __EOF__ diff --git a/packaging/man/man8/engine-config.8 b/packaging/man/man8/engine-config.8 index 8cf4bbb..7ecd9ba 100644 --- a/packaging/man/man8/engine-config.8 +++ b/packaging/man/man8/engine-config.8 @@ -85,6 +85,12 @@ .BR .RE PasswordEntry varies between the different password options. + +.SH CUSTOM LOGGING +If you need custom logging setup, please create your own java.util.logging properties file, +set a path to this file into OVIRT_LOGGING_PROPERTIES environment variable and execute +engine-config. + .SH NOTE In order for your change(s) to take effect, restart the oVirt engine. -- To view, visit http://gerrit.ovirt.org/33758 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9bc5019a7bec898500d4a5c562771d2809cd6b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
