From 3f8f00ca2f8e0e0ddbfb431bf85d5414802af659 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Tue, 6 Oct 2015 15:05:51 -0400 Subject: [PATCH] Fixes #10 --- vladiate/logs.py | 9 +++++++++ vladiate/main.py | 11 ++--------- vladiate/vlad.py | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 vladiate/logs.py diff --git a/vladiate/logs.py b/vladiate/logs.py new file mode 100644 index 0000000..3012104 --- /dev/null +++ b/vladiate/logs.py @@ -0,0 +1,9 @@ +import logging + +logging.basicConfig(level=logging.INFO) +logger = logging.getLogger("vlad_logger") +sh = logging.StreamHandler() +sh.setLevel(logging.INFO) +sh.setFormatter(logging.Formatter('%(message)s')) +logger.addHandler(sh) +logger.propagate = False diff --git a/vladiate/main.py b/vladiate/main.py index 280d2e7..293a160 100644 --- a/vladiate/main.py +++ b/vladiate/main.py @@ -1,21 +1,13 @@ import vladiate from vladiate import Vlad +from vladiate import logs import os import sys import inspect -import logging from optparse import OptionParser from pkg_resources import get_distribution -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger("vlad_logger") -sh = logging.StreamHandler() -sh.setLevel(logging.INFO) -sh.setFormatter(logging.Formatter('%(message)s')) -logger.addHandler(sh) -logger.propagate = False - def parse_options(): """ @@ -142,6 +134,7 @@ def load_vladfile(path): def main(): parser, options, arguments = parse_options() + logger = logs.logger if options.show_version: print "Vladiate %s" % (get_distribution('vladiate').version, ) diff --git a/vladiate/vlad.py b/vladiate/vlad.py index 60cdda6..01b04cf 100644 --- a/vladiate/vlad.py +++ b/vladiate/vlad.py @@ -1,15 +1,15 @@ import sys import csv -import logging from collections import defaultdict from vladiate.exceptions import ValidationException from vladiate.validators import EmptyValidator +from vladiate import logs class Vlad(object): def __init__(self, source, validators={}, default_validator=EmptyValidator): - self.logger = logging.getLogger("vlad_logger") + self.logger = logs.logger self.failures = defaultdict(lambda: defaultdict(list)) self.missing_validators = None self.missing_fields = None