Skip to content

Commit

Permalink
logging fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Ward committed Jan 23, 2014
1 parent 5aa6cd4 commit 45a168f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
1 change: 0 additions & 1 deletion src/metriqued/metriqued/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def __init__(self, name=None, **kwargs):
'gzip': True,
'host': '127.0.0.1',
'krb_auth': False,
'logger_name': name,
'logdir': LOG_DIR,
'logfile': '%s.log' % name,
'log2file': True,
Expand Down
14 changes: 4 additions & 10 deletions src/metriquet/metriquet/tornadohttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
logging.basicConfig()
root_logger = logging.getLogger()
[root_logger.removeHandler(hdlr) for hdlr in root_logger.handlers]
BASIC_FORMAT = "%(name)s:%(asctime)s:%(message)s"
BASIC_FORMAT = "%(name)s.%(process)s:%(asctime)s:%(message)s"
LOG_FORMAT = logging.Formatter(BASIC_FORMAT, "%Y%m%dT%H%M%S")


Expand Down Expand Up @@ -64,7 +64,6 @@ def __init__(self, config_file=None, name=None, **kwargs):
'logfile': log_file,
'logrotate': False,
'logkeep': 3,
'logger_name': self.name,
'static_path': STATIC_PATH,
'template_path': TEMPLATE_PATH,
}
Expand All @@ -89,12 +88,7 @@ def __init__(self, config_file=None, name=None, **kwargs):
self.name = name or self.name
self.conf = TornadoConfig(config_file=config_file, **kwargs)

@property
def logger_name(self):
logger_name = '%s.%s' % (self.conf['logger_name'], self.pid)
return logger_name

def _setup_logger(self, logger):
def _setup_logger(self, logger, propagate=0):
logdir = os.path.expanduser(self.conf.logdir)
logfile = os.path.join(logdir, self.conf.logfile)

Expand All @@ -120,14 +114,14 @@ def _setup_logger(self, logger):
elif self.conf.debug in [True, 1, 2]:
logger.setLevel(logging.DEBUG)

logger.propagate = 0
logger.propagate = propagate

return logger

def setup_logger(self):
if self.conf.debug == 2:
self._setup_logger(logging.getLogger())
logger = logging.getLogger(self.logger_name)
logger = logging.getLogger(self.name)
return self._setup_logger(logger)

@property
Expand Down

0 comments on commit 45a168f

Please sign in to comment.