Only configure logging inside the context

asottile · asottile · commit e4f0b4c1b7ec · 2019-01-01T15:01:37.000-08:00
diff --git a/pre_commit/logging_handler.py b/pre_commit/logging_handler.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import contextlib
 import logging
 
 from pre_commit import color
@@ -34,6 +35,12 @@ def emit(self, record):
         )
 
 
-def add_logging_handler(*args, **kwargs):
-    logger.addHandler(LoggingHandler(*args, **kwargs))
+@contextlib.contextmanager
+def logging_handler(*args, **kwargs):
+    handler = LoggingHandler(*args, **kwargs)
+    logger.addHandler(handler)
     logger.setLevel(logging.INFO)
+    try:
+        yield
+    finally:
+        logger.removeHandler(handler)
diff --git a/pre_commit/main.py b/pre_commit/main.py
@@ -20,7 +20,7 @@
 from pre_commit.commands.try_repo import try_repo
 from pre_commit.error_handler import error_handler
 from pre_commit.error_handler import FatalError
-from pre_commit.logging_handler import add_logging_handler
+from pre_commit.logging_handler import logging_handler
 from pre_commit.store import Store
 from pre_commit.util import CalledProcessError
 
@@ -248,9 +248,7 @@ def main(argv=None):
     elif args.command == 'help':
         parser.parse_args(['--help'])
 
-    with error_handler():
-        add_logging_handler(args.color)
-
+    with error_handler(), logging_handler(args.color):
         _adjust_args_and_chdir(args)
 
         store = Store()
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -11,7 +11,7 @@
 import six
 
 from pre_commit import output
-from pre_commit.logging_handler import add_logging_handler
+from pre_commit.logging_handler import logging_handler
 from pre_commit.store import Store
 from pre_commit.util import cmd_output
 from testing.fixtures import git_dir
@@ -155,7 +155,8 @@ class YouForgotToExplicitlyChooseAStoreDirectory(AssertionError):
 
 @pytest.fixture(autouse=True, scope='session')
 def configure_logging():
-    add_logging_handler(use_color=False)
+    with logging_handler(use_color=False):
+        yield
 
 
 @pytest.fixture
