You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/05/24 07:40:19 UTC
ambari git commit: Revert "AMBARI-11349. ambari-agent.out file grows
geometrically (aonishuk via smohanty)"
Repository: ambari
Updated Branches:
refs/heads/trunk 4b472cc68 -> 49164681e
Revert "AMBARI-11349. ambari-agent.out file grows geometrically (aonishuk via smohanty)"
This reverts commit 48e0f3c723927d5d49160ac7ed3c5275f8eb66f2.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49164681
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49164681
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49164681
Branch: refs/heads/trunk
Commit: 49164681ea670cc498a18af39381245e00796b34
Parents: 4b472cc
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sat May 23 22:39:43 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sat May 23 22:39:43 2015 -0700
----------------------------------------------------------------------
.../src/main/python/ambari_agent/alerts/script_alert.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/49164681/ambari-agent/src/main/python/ambari_agent/alerts/script_alert.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/script_alert.py b/ambari-agent/src/main/python/ambari_agent/alerts/script_alert.py
index f0f5276..b8b4daf 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/script_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/script_alert.py
@@ -24,7 +24,6 @@ import os
import re
from alerts.base_alert import BaseAlert
from resource_management.core.environment import Environment
-from resource_management.core.logger import Logger
logger = logging.getLogger()
@@ -99,9 +98,7 @@ class ScriptAlert(BaseAlert):
matchObj = re.match( r'((.*)services\/(.*)\/package\/)', self.path_to_script)
if matchObj:
basedir = matchObj.group(1)
- Logger.logger = logging.getLogger()
- Logger.logger.setLevel(logging.ERROR)
- with Environment(basedir, tmp_dir=self.config.get('agent', 'tmp_dir'), logging_level=logging.ERROR) as env:
+ with Environment(basedir, tmp_dir=self.config.get('agent', 'tmp_dir')) as env:
return cmd_module.execute(configurations, self.parameters, self.host_name)
else:
return cmd_module.execute(configurations, self.parameters, self.host_name)