ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-15796. Exception seen in ambari-agent during restart. (aonishuk)
Date Mon, 11 Apr 2016 20:27:16 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 4c91a694d -> 6ea7fd750


AMBARI-15796. Exception seen in ambari-agent during restart. (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ea7fd75
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ea7fd75
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ea7fd75

Branch: refs/heads/trunk
Commit: 6ea7fd75073399761e41ea77e8977933aee873a5
Parents: 4c91a69
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon Apr 11 23:27:13 2016 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Mon Apr 11 23:27:13 2016 +0300

----------------------------------------------------------------------
 ambari-agent/src/main/python/ambari_agent/main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ea7fd75/ambari-agent/src/main/python/ambari_agent/main.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py
index a448748..34d4e74 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -359,9 +359,9 @@ if __name__ == "__main__":
     heartbeat_stop_callback = bind_signal_handlers(agentPid)
   
     main(heartbeat_stop_callback)
-  except SystemExit as e:
-    raise e
-  except BaseException as e:
+  except SystemExit:
+    raise
+  except BaseException:
     if is_logger_setup:
-      logger.exception("Exiting with exception:" + e)
-  raise
+      logger.exception("Exiting with exception:")
+    raise


Mime
View raw message