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

Add --fatal=errors|warnings program option

Browse source
This commit is contained in:
Kernc 2015-11-15 20:34:35 +01:00
commit 9a04ce660c
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pelican/__init__.py
View file

@ -322,6 +322,11 @@ def parse_arguments():
dest='selected_paths', default=None, dest='selected_paths', default=None,
help='Comma separated list of selected paths to write') help='Comma separated list of selected paths to write')
parser.add_argument('--fatal', metavar='errors|warnings',
choices=('errors', 'warnings'),
help=('Exit the program with non-zero status if any '
'errors/warnings encountered.'))
return parser.parse_args() return parser.parse_args()
@ -378,7 +383,7 @@ def get_instance(args):
def main(): def main():
args = parse_arguments() args = parse_arguments()
init(args.verbosity) init(args.verbosity, args.fatal)
logger.debug('Pelican version: %s', __version__) logger.debug('Pelican version: %s', __version__)
logger.debug('Python version: %s', sys.version.split()[0]) logger.debug('Python version: %s', sys.version.split()[0])

21
pelican/log.py
View file

@ -175,7 +175,22 @@ class LimitLogger(SafeLogger):
def enable_filter(self): def enable_filter(self):
self.addFilter(LimitLogger.limit_filter) self.addFilter(LimitLogger.limit_filter)
logging.setLoggerClass(LimitLogger)
class FatalLogger(LimitLogger):
warnings_fatal = False
errors_fatal = False
def warning(self, *args, **kwargs):
super(FatalLogger, self).warning(*args, **kwargs)
if FatalLogger.warnings_fatal:
raise RuntimeError('Warning encountered')
def error(self, *args, **kwargs):
super(FatalLogger, self).error(*args, **kwargs)
if FatalLogger.errors_fatal:
raise RuntimeError('Error encountered')
logging.setLoggerClass(FatalLogger)
def supports_color(): def supports_color():
@ -203,7 +218,9 @@ def get_formatter():
return TextFormatter() return TextFormatter()
def init(level=None, handler=logging.StreamHandler(), name=None): def init(level=None, fatal='', handler=logging.StreamHandler(), name=None):
FatalLogger.warnings_fatal = fatal.startswith('warning')
FatalLogger.errors_fatal = bool(fatal)
logger = logging.getLogger(name) logger = logging.getLogger(name)