github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix exception logging

Browse source 
Adds exception type to the exception logging.
Removes the extra logging for autoreload in debug mode, since `raise`
will make it caught by the global `try/except` below and it'll be
logged there.

This replaces #1723 and also removes extra exception logging caused
in #1718.
This commit is contained in:
Deniz Turgut 2015-06-03 17:01:06 -04:00
commit 735a4452df
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pelican/__init__.py
View file

@ -444,7 +444,6 @@ def main():
except Exception as e: except Exception as e:
if (args.verbosity == logging.DEBUG): if (args.verbosity == logging.DEBUG):
logger.critical('Internal failure: %r', e, exc_info=True)
raise raise
logger.warning( logger.warning(
'Caught exception "%s". Reloading.', e) 'Caught exception "%s". Reloading.', e)

2
pelican/log.py
View file

@ -149,7 +149,7 @@ class SafeLogger(logging.Logger):
so convert the message to unicode with the correct encoding so convert the message to unicode with the correct encoding
''' '''
if isinstance(arg, Exception): if isinstance(arg, Exception):
text = str(arg) text = '%s: %s' % (arg.__class__.__name__, arg)
if six.PY2: if six.PY2:
text = text.decode(self._exc_encoding) text = text.decode(self._exc_encoding)
return text return text