Martin Peřina has uploaded a new change for review. Change subject: tools: Rename --log4j-config param in manage-domains ......................................................................
tools: Rename --log4j-config param in manage-domains Renames --log4j-config param to --log-config in engine-manage-domains as this parameter in newly used to specify custom java.util.logging setup. Change-Id: I94400b69818fc7c2349dec3d9fef961c1b42919a Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java M backend/manager/modules/builtin-extensions/src/main/resources/manage-domains-help.properties M packaging/man/man8/engine-manage-domains.8 4 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/32854/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java index a05ec0e..0e4acef 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java @@ -101,7 +101,7 @@ /** * Log4j config file */ - public static final String ARG_LOG4J_CONFIG = "--log4j-config"; + public static final String ARG_LOG_CONFIG = "--log-config"; /** * Password file @@ -203,7 +203,7 @@ .build()); parser.addArg(new ArgumentBuilder() - .longName(ARG_LOG4J_CONFIG) + .longName(ARG_LOG_CONFIG) .valueRequired(true) .build()); diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java index e331c29..44dfa20 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java @@ -1,7 +1,7 @@ package org.ovirt.engine.extensions.aaa.builtin.tools; import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_HELP; -import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_LOG4J_CONFIG; +import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_LOG_CONFIG; import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_LOG_FILE; import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_LOG_LEVEL; @@ -25,7 +25,7 @@ mdArgs = new ManageDomainsArguments(); mdArgs.parse(args); - setupLogging(mdArgs.get(ARG_LOG4J_CONFIG), mdArgs.get(ARG_LOG_FILE), mdArgs.get(ARG_LOG_LEVEL)); + setupLogging(mdArgs.get(ARG_LOG_CONFIG), mdArgs.get(ARG_LOG_FILE), mdArgs.get(ARG_LOG_LEVEL)); } catch (Throwable t) { System.out.println(t.getMessage()); System.exit(1); diff --git a/backend/manager/modules/builtin-extensions/src/main/resources/manage-domains-help.properties b/backend/manager/modules/builtin-extensions/src/main/resources/manage-domains-help.properties index 3352828..ccb251f 100644 --- a/backend/manager/modules/builtin-extensions/src/main/resources/manage-domains-help.properties +++ b/backend/manager/modules/builtin-extensions/src/main/resources/manage-domains-help.properties @@ -52,8 +52,8 @@ \n--log-level=LOG_LEVEL\ \n\tSets log level, one of DEBUG (default), INFO, WARN, ERROR (case insensitive).\ \n\ -\n--log4j-config=XML_FILE\ -\n\tSets log4j.xml file which logging configuration is loaded from.\ +\n--log-config=PROPERTIES_FILE\ +\n\tSets java.util.logging properties file which logging configuration is loaded from.\ \n\ \n--provider=PROVIDER\ \n\tThe LDAP provider type of server used for the domain, can be one of (case insensitive):\ diff --git a/packaging/man/man8/engine-manage-domains.8 b/packaging/man/man8/engine-manage-domains.8 index ceea6fa..d3b16be 100644 --- a/packaging/man/man8/engine-manage-domains.8 +++ b/packaging/man/man8/engine-manage-domains.8 @@ -92,9 +92,9 @@ Sets log level, one of DEBUG (default), INFO, WARN, ERROR (case insensitive). .RE .PP -\fB\-\-log4j\-config\fR=\fIXML_FILE\fR +\fB\-\-log\-config\fR=\fIPROPERTIES_FILE\fR .RS 4 -Sets log4j.xml file which logging configuration is loaded from. +Sets java.util.logging properties file which logging configuration is loaded from. .RE .PP \fB\-\-provider\fR=\fIPROVIDER\fR -- To view, visit http://gerrit.ovirt.org/32854 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94400b69818fc7c2349dec3d9fef961c1b42919a 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
