Repository: ambari Updated Branches: refs/heads/trunk eee2a7a88 -> 3a4d89035
AMBARI-12605. SyntaxWarning: name 'is_logger_setup' is assigned to before global declaration (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a4d8903 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a4d8903 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a4d8903 Branch: refs/heads/trunk Commit: 3a4d890351e63031faafa235d647edbb8076bfff Parents: eee2a7a Author: Andrew Onishuk <[email protected]> Authored: Fri Jul 31 13:51:36 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Fri Jul 31 13:51:36 2015 +0300 ---------------------------------------------------------------------- ambari-agent/src/main/python/ambari_agent/main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3a4d8903/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 857074c..3a3cd23 100644 --- a/ambari-agent/src/main/python/ambari_agent/main.py +++ b/ambari-agent/src/main/python/ambari_agent/main.py @@ -47,7 +47,6 @@ from HeartbeatHandlers import bind_signal_handlers from ambari_commons.constants import AMBARI_SUDO_BINARY logger = logging.getLogger(__name__) -is_logger_setup = False formatstr = "%(levelname)s %(asctime)s %(filename)s:%(lineno)d - %(message)s" agentPid = os.getpid() config = AmbariConfig.AmbariConfig() @@ -240,7 +239,7 @@ def main(heartbeat_stop_callback=None): current_user = getpass.getuser() setup_logging(options.verbose) - + default_cfg = {'agent': {'prefix': '/home/ambari'}} config.load(default_cfg) @@ -305,12 +304,12 @@ def main(heartbeat_stop_callback=None): logger.info("finished") if __name__ == "__main__": + is_logger_setup = False try: heartbeat_stop_callback = bind_signal_handlers(agentPid) main(heartbeat_stop_callback) except: - global is_logger_setup if is_logger_setup: logger.exception("Fatal exception occurred:") raise
