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

Merge 8c01dbfad8 into 4e438ffe60

Browse source
This commit is contained in:
Andreas Krüger 2023-10-30 16:11:26 +01:00 • committed by GitHub
commit 85102b9361
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
RELEASE.md Normal file
View file

@ -0,0 +1,3 @@
Release type: major
Change default of `--fatal` command line switch to terminate on error.

8
pelican/__init__.py
View file

@ -358,10 +358,10 @@ def parse_arguments(argv=None):
dest='selected_paths', default=None,
help='Comma separated list of selected paths to write')
parser.add_argument('--fatal', metavar='errors|warnings',
choices=('errors', 'warnings'), default='',
parser.add_argument('--fatal', metavar='errors|warnings|ignore',
choices=('errors', 'warnings', 'ignore'), default='errors',
help=('Exit the program with non-zero status if any '
'errors/warnings encountered.'))
'errors/warnings encountered, or ignore any errors.'))
parser.add_argument('--logs-dedup-min-level', default='WARNING',
choices=('DEBUG', 'INFO', 'WARNING', 'ERROR'),
@ -518,7 +518,7 @@ def listen(server, port, output, excqueue=None):
def main(argv=None):
args = parse_arguments(argv)
logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
init_logging(level=args.verbosity, fatal=args.fatal,
init_logging(level=args.verbosity, fatal=(args.fatal if args.fatal != 'ignore' else ''),
name=__name__, logs_dedup_min_level=logs_dedup_min_level)
logger.debug('Pelican version: %s', __version__)

2
pelican/log.py
View file

@ -103,7 +103,7 @@ logging.setLoggerClass(FatalLogger)
logging.getLogger().__class__ = FatalLogger
def init(level=None, fatal='', handler=RichHandler(console=console), name=None,
def init(level=None, fatal='errors', handler=RichHandler(console=console), name=None,
logs_dedup_min_level=None):
FatalLogger.warnings_fatal = fatal.startswith('warning')
FatalLogger.errors_fatal = bool(fatal)