Only configure logging inside the context

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 @@ class LoggingHandler(logging.Handler):
         )
 
 
-def add_logging_handler(*args, **kwargs):
+@contextlib.contextmanager
-    logger.addHandler(LoggingHandler(*args, **kwargs))
+def logging_handler(*args, **kwargs):
+    handler = LoggingHandler(*args, **kwargs)
+    logger.addHandler(handler)
     logger.setLevel(logging.INFO)
+    try:
+        yield
+    finally:
+        logger.removeHandler(handler)

pre_commit/main.py

@@ -20,7 +20,7 @@ from pre_commit.commands.sample_config import sample_config
 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():
+    with error_handler(), logging_handler(args.color):
-        add_logging_handler(args.color)
-
         _adjust_args_and_chdir(args)
 
         store = Store()

tests/conftest.py

@@ -11,7 +11,7 @@ import pytest
 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 @@ def dont_write_to_home_directory():
 
 @pytest.fixture(autouse=True, scope='session')
 def configure_logging():
-    add_logging_handler(use_color=False)
+    with logging_handler(use_color=False):
+        yield
 
 
 @pytest.fixture