Alon Bar-Lev has uploaded a new change for review. Change subject: services: notifier: use new health uri ......................................................................
services: notifier: use new health uri no idea why notifier does not use API. URI of health servlet was modified, we need to use the new one. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=961677 Change-Id: I5747c1137cd8d0b4c5e89f82d772526103ce8dc5 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/20791/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java index b8107a6..8d47fcc 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java @@ -163,7 +163,7 @@ * number of the URL */ public URL getExternalHttpUrl(String path) throws MalformedURLException { - return new URL("http", getHost(), getExternalHttpPort(), path); + return new URL("http", getHost(), getExternalHttpPort(), getEngineURI() + path); } /** @@ -175,7 +175,7 @@ * number of the URL */ public URL getExternalHttpsUrl(String path) throws MalformedURLException { - return new URL("https", getHost(), getExternalHttpsPort(), path); + return new URL("https", getHost(), getExternalHttpsPort(), getEngineURI() + path); } public File getPKIDir() { @@ -213,4 +213,8 @@ public File getEngineUpMark(){ return getFile("ENGINE_UP_MARK"); } + + public String getEngineURI(){ + return getProperty("ENGINE_URI"); + } } diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java index 7e36e09..cb3bd85 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java @@ -46,7 +46,7 @@ private static final Logger log = Logger.getLogger(EngineMonitorService.class); private static final String ENGINE_NOT_RESPONDING_ERROR = "Engine server is not responding."; private static final String ENGINE_RESPONDING_MESSAGE = "Engine server is up and running."; - private static final String HEALTH_SERVLET_PATH = "/OvirtEngineWeb/HealthStatus"; + private static final String HEALTH_SERVLET_PATH = "/services/health"; private DataSource ds; private NotificationProperties prop = null; private long serverMonitorTimeout; -- To view, visit http://gerrit.ovirt.org/20791 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5747c1137cd8d0b4c5e89f82d772526103ce8dc5 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
