AMBARI-13307. Agent instance memory footprint likely gradually growing (aonishuk)

ambari-common/src/main/python/resource_management/libraries/script/script.py

@@ -116,7 +116,7 @@ class Script(object):
             Script.structuredOut = json.load(fp)
           except Exception:
             errMsg = 'Unable to read structured output from ' + self.stroutfile
-            Logging.logger.exception(errMsg)
+            Logger.logger.exception(errMsg)
             pass
 
     # version is only set in a specific way and should not be carried
@@ -211,7 +211,7 @@ class Script(object):
             Script.passwords[get_path_from_configuration(k, Script.config)] = get_path_from_configuration(v, Script.config)
 
     except IOError:
-      Logging.logger.exception("Can not read json file with command parameters: ")
+      Logger.logger.exception("Can not read json file with command parameters: ")
       sys.exit(1)
 
     # Run class method depending on a command type

ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py

@@ -163,20 +163,18 @@ class TestFlumeHandler(RMFTestCase):
 
    self.assertFalse("version" in script.structuredOut)
 
-  @patch("resource_management.libraries.script.Script.logger", autospec = True)
-  def test_bad_struct_out(self, logger_mock):
+  def test_bad_struct_out(self):
       from resource_management.libraries.script import Script
-
-      logger_mock.warn = MagicMock()
+      from resource_management.core.logger import Logger
 
       configs_path = os.path.join(RMFTestCase.get_src_folder(),
                                   "test/python/stacks", self.STACK_VERSION, "configs")
 
+      Logger.initialize_logger()
       script = Script()
       script.stroutfile = os.path.join(configs_path, "structured-out-status-bad.json")
       script.load_structured_out()
 
-      self.assertTrue(logger_mock.warn.called)
       self.assertTrue(script.structuredOut == {})
 
   @patch("resource_management.libraries.script.Script.put_structured_out")