Ori Liel has uploaded a new change for review. Change subject: notifier: Change Config Option Name (#1172072) ......................................................................
notifier: Change Config Option Name (#1172072) Changed HTML_MESSAGE_FORMAT to MAIL_HTML_MESSAGE_FORMAT because other configuration options start with 'MAIL_' prefix Bug-Url: https://bugzilla.redhat.com/1172072 Change-Id: Ia16862630904e8013892effe747a83074977ecf7 Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java M backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf M backend/manager/tools/src/test/resources/conf/error-notifier.conf M backend/manager/tools/src/test/resources/conf/notifier-prop-test.conf M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in 5 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/40544/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java index 1023835..6311aaa 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java @@ -48,7 +48,7 @@ private static final String MAIL_PASSWORD = "MAIL_PASSWORD"; private static final String MAIL_FROM = "MAIL_FROM"; private static final String MAIL_REPLY_TO = "MAIL_REPLY_TO"; - private static final String HTML_MESSAGE_FORMAT = "HTML_MESSAGE_FORMAT"; + private static final String MAIL_HTML_MESSAGE_FORMAT = "MAIL_HTML_MESSAGE_FORMAT"; private static final String MAIL_SMTP_ENCRYPTION = "MAIL_SMTP_ENCRYPTION"; private static final String MAIL_SMTP_ENCRYPTION_NONE = "none"; private static final String MAIL_SMTP_ENCRYPTION_SSL = "ssl"; @@ -87,7 +87,7 @@ retries = props.validateNonNegetive(MAIL_RETRIES); sendIntervals = props.validateNonNegetive(MAIL_SEND_INTERVAL); - isBodyHtml = props.getBoolean(HTML_MESSAGE_FORMAT, false); + isBodyHtml = props.getBoolean(MAIL_HTML_MESSAGE_FORMAT, false); from = props.validateEmail(MAIL_FROM); replyTo = props.validateEmail(MAIL_REPLY_TO); diff --git a/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf b/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf index 8bf0b01..6cb9bd0 100644 --- a/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf +++ b/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf @@ -9,7 +9,7 @@ #MAIL_PORT=0 [email protected] #MAIL_PASSWORD=xxxx -#HTML_MESSAGE_FORMAT=true +#MAIL_HTML_MESSAGE_FORMAT=true #MAIL_SMTP_ENCRYPTION=none #MAIL_USE_DEFAULT_CREDENTIALS=false diff --git a/backend/manager/tools/src/test/resources/conf/error-notifier.conf b/backend/manager/tools/src/test/resources/conf/error-notifier.conf index 872fcf5..76c28e1 100644 --- a/backend/manager/tools/src/test/resources/conf/error-notifier.conf +++ b/backend/manager/tools/src/test/resources/conf/error-notifier.conf @@ -9,7 +9,7 @@ #MAIL_PORT=0 [email protected] #MAIL_PASSWORD=xxxx -#HTML_MESSAGE_FORMAT=true +#MAIL_HTML_MESSAGE_FORMAT=true #MAIL_SMTP_ENCRYPTION=none #MAIL_USE_DEFAULT_CREDENTIALS=false diff --git a/backend/manager/tools/src/test/resources/conf/notifier-prop-test.conf b/backend/manager/tools/src/test/resources/conf/notifier-prop-test.conf index 933f6a0..25563a4 100644 --- a/backend/manager/tools/src/test/resources/conf/notifier-prop-test.conf +++ b/backend/manager/tools/src/test/resources/conf/notifier-prop-test.conf @@ -4,7 +4,7 @@ #MAIL_PORT=25 [email protected] #MAIL_PASSWORD=xxxx -#HTML_MESSAGE_FORMAT=true +#MAIL_HTML_MESSAGE_FORMAT=true #MAIL_SMTP_ENCRYPTION=none #MAIL_USE_DEFAULT_CREDENTIALS=false diff --git a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in index 8e35718..d636027 100644 --- a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in +++ b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in @@ -178,7 +178,7 @@ MAIL_SMTP_ENCRYPTION=none # If set to true, sends a message in HTML format. -HTML_MESSAGE_FORMAT=false +MAIL_HTML_MESSAGE_FORMAT=false # Specifies 'from' address on sent mail in RFC822 format, if supported by mail server. MAIL_FROM= -- To view, visit https://gerrit.ovirt.org/40544 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia16862630904e8013892effe747a83074977ecf7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
