From 70b3def5650bcec85d3aedebb7d74b899e3aaaf3 Mon Sep 17 00:00:00 2001 From: dim Date: Mon, 10 Dec 2007 10:35:59 +0000 Subject: [PATCH] New logging mecanism init fix, when nothing is configured --- pgloader.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pgloader.py b/pgloader.py index 4268adb..246e317 100644 --- a/pgloader.py +++ b/pgloader.py @@ -5,7 +5,7 @@ PostgreSQL data import tool, see included man page. """ -import os, sys, os.path, time, codecs +import os, sys, os.path, time, codecs, logging from cStringIO import StringIO import pgloader.options @@ -152,7 +152,6 @@ def parse_options(): pgloader.options.LOG_FILE = opts.logfile - import logging if opts.loglevel: loglevel = pgloader.logger.level(opts.loglevel) pgloader.options.CLIENT_MIN_MESSAGES = loglevel @@ -197,13 +196,13 @@ def parse_config(conffile): pgloader.options.CLIENT_MIN_MESSAGES = pgloader.logger.level(cmm) else: # CLIENT_MIN_MESSAGES has not been set at all - pgloader.options.CLIENT_MIN_MESSAGES = NOTICE + pgloader.options.CLIENT_MIN_MESSAGES = logging.INFO if config.has_option(section, 'log_min_messages'): lmm = config.get(section, 'log_min_messages') pgloader.options.LOG_MIN_MESSAGES = pgloader.logger.level(lmm) else: - pgloader.options.LOG_MIN_MESSAGES = NOTICE + pgloader.options.LOG_MIN_MESSAGES = logging.INFO if config.has_option(section, 'log_file'): # don't overload the command line -L option if given