Centralize logging initialization

This commit is contained in:
Anthony Sottile 2016-11-26 14:18:13 -08:00
parent 323507c9e3
commit a7169905dc
18 changed files with 26 additions and 43 deletions

View file

@ -1,8 +1,6 @@
from __future__ import print_function
from __future__ import unicode_literals
import logging
from aspy.yaml import ordered_dump
from aspy.yaml import ordered_load
@ -12,7 +10,6 @@ from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
from pre_commit.clientlib.validate_config import is_local_hooks
from pre_commit.clientlib.validate_config import load_config
from pre_commit.jsonschema_extensions import remove_defaults
from pre_commit.logging_handler import LoggingHandler
from pre_commit.ordereddict import OrderedDict
from pre_commit.repository import Repository
from pre_commit.util import CalledProcessError
@ -20,9 +17,6 @@ from pre_commit.util import cmd_output
from pre_commit.util import cwd
logger = logging.getLogger('pre_commit')
class RepositoryCannotBeUpdatedError(RuntimeError):
pass
@ -69,10 +63,6 @@ def _update_repository(repo_config, runner):
def autoupdate(runner):
"""Auto-update the pre-commit config to the latest versions of repos."""
# Set up our logging handler
logger.addHandler(LoggingHandler(False))
logger.setLevel(logging.WARNING)
retv = 0
output_configs = []
changed = False

View file

@ -2,21 +2,15 @@ from __future__ import print_function
from __future__ import unicode_literals
import io
import logging
import os
import os.path
import sys
from pre_commit import output
from pre_commit.logging_handler import LoggingHandler
from pre_commit.util import make_executable
from pre_commit.util import mkdirp
from pre_commit.util import resource_filename
logger = logging.getLogger('pre_commit')
# This is used to identify the hook file we install
PREVIOUS_IDENTIFYING_HASHES = (
'4d9958c90bc262f47553e2c073f14cfe',
@ -88,9 +82,6 @@ def install(runner, overwrite=False, hooks=False, hook_type='pre-commit'):
# If they requested we install all of the hooks, do so.
if hooks:
# Set up our logging handler
logger.addHandler(LoggingHandler(False))
logger.setLevel(logging.INFO)
for repository in runner.repositories:
repository.require_installed()

View file

@ -8,7 +8,6 @@ import sys
from pre_commit import color
from pre_commit import git
from pre_commit import output
from pre_commit.logging_handler import LoggingHandler
from pre_commit.output import get_hook_message
from pre_commit.staged_files_only import staged_files_only
from pre_commit.util import cmd_output
@ -178,9 +177,6 @@ def _has_unstaged_config(runner):
def run(runner, args, environ=os.environ):
no_stash = args.no_stash or args.all_files or bool(args.files)
# Set up our logging handler
logger.addHandler(LoggingHandler(args.color))
logger.setLevel(logging.INFO)
# Check if we have unresolved merge conflict files and fail fast.
if _has_unmerged_paths(runner):