diff options
author | Jonathan Abrahams <jonathan@mongodb.com> | 2018-12-13 12:03:09 -0500 |
---|---|---|
committer | David Bradford <david.bradford@mongodb.com> | 2019-08-01 17:02:17 -0400 |
commit | 74f9c3bbd17e2e057f2def58adf341628a94f83a (patch) | |
tree | 34afaf3a15c6237974b46eae191bc696de0065ac | |
parent | 4a0def0129ae5aa6c8ea951b5c452c8938cf4d83 (diff) | |
download | mongo-74f9c3bbd17e2e057f2def58adf341628a94f83a.tar.gz |
SERVER-38395 Python global logger is polluted when importing certain resmokelib modules
(cherry picked from commit acefbb86080b63c847700c764d08c5d8bcd9c58f)
-rw-r--r-- | buildscripts/mobile/adb_monitor.py | 5 | ||||
-rw-r--r-- | buildscripts/mobile/benchrun_embedded_setup_android.py | 5 | ||||
-rw-r--r-- | buildscripts/scons_cache_prune.py | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/buildscripts/mobile/adb_monitor.py b/buildscripts/mobile/adb_monitor.py index 26966d4a218..d33a37e08d8 100644 --- a/buildscripts/mobile/adb_monitor.py +++ b/buildscripts/mobile/adb_monitor.py @@ -23,8 +23,6 @@ from buildscripts.util import fileops from buildscripts.util import runcommand # Initialize the global logger. -logging.basicConfig(format="%(asctime)s %(levelname)s %(message)s", level=logging.INFO) -logging.Formatter.converter = time.gmtime LOGGER = logging.getLogger(__name__) @@ -327,6 +325,9 @@ class AdbContinuousResourceMonitor(AdbResourceMonitor): def main(): #pylint: disable=too-many-statements """Execute Main program.""" + logging.basicConfig(format="%(asctime)s %(levelname)s %(message)s", level=logging.INFO) + logging.Formatter.converter = time.gmtime + parser = optparse.OptionParser() program_options = optparse.OptionGroup(parser, "Program Options") diff --git a/buildscripts/mobile/benchrun_embedded_setup_android.py b/buildscripts/mobile/benchrun_embedded_setup_android.py index cbda82ac7ec..f2aaac544bd 100644 --- a/buildscripts/mobile/benchrun_embedded_setup_android.py +++ b/buildscripts/mobile/benchrun_embedded_setup_android.py @@ -23,8 +23,6 @@ if __name__ == "__main__" and __package__ is None: from buildscripts.mobile import adb_monitor # Initialize the global logger. -logging.basicConfig(format="%(asctime)s %(levelname)s %(message)s", level=logging.INFO) -logging.Formatter.converter = time.gmtime LOGGER = logging.getLogger(__name__) @@ -95,6 +93,9 @@ def move_sdk_files(adb, sdk_root_dir): def main(): """Execute Main program.""" + logging.basicConfig(format="%(asctime)s %(levelname)s %(message)s", level=logging.INFO) + logging.Formatter.converter = time.gmtime + benchrun_root = "/data/local/tmp/benchrun_embedded" parser = optparse.OptionParser() diff --git a/buildscripts/scons_cache_prune.py b/buildscripts/scons_cache_prune.py index da60ab8efa4..dc6b520d6da 100644 --- a/buildscripts/scons_cache_prune.py +++ b/buildscripts/scons_cache_prune.py @@ -17,7 +17,6 @@ import logging import os import shutil -logging.basicConfig(level=logging.INFO) LOGGER = logging.getLogger("scons.cache.prune.lru") # type: ignore GIGBYTES = 1024 * 1024 * 1024 @@ -106,6 +105,9 @@ def prune_cache(cache_path, cache_size_gb, clean_ratio): def main(): """Execute Main entry.""" + + logging.basicConfig(level=logging.INFO) + parser = argparse.ArgumentParser(description="SCons cache pruning tool") parser.add_argument("--cache-dir", "-d", default=None, help="path to the cache directory.") |