You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/03/18 20:15:22 UTC
ambari git commit: AMBARI-10124. Wrong alert on added host on secure
cluster (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 217f3d71c -> 32e121563
AMBARI-10124. Wrong alert on added host on secure cluster (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/32e12156
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/32e12156
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/32e12156
Branch: refs/heads/trunk
Commit: 32e1215639f3cdfea68e2955f316576f1ded85fe
Parents: 217f3d7
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Mar 18 15:13:50 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Mar 18 15:13:58 2015 -0400
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/32e12156/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
index 1a6540a..ab68560 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
@@ -140,8 +140,8 @@ class WebAlert(BaseAlert):
"""
Makes an http(s) request to a web resource and returns the http code. If
there was an error making the request, return 0 for the status code.
- """
-
+ """
+ error_msg = None
try:
response_code = 0
kerberos_keytab = None
@@ -210,7 +210,7 @@ class WebAlert(BaseAlert):
# empty quotes evaluates to false
if curl_stderr:
- raise Exception(curl_stderr)
+ error_msg = curl_stderr
# empty quotes evaluates to false
if curl_stdout: