Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Terminate unsuccessfully on error as default for --fatal. Fixes #3172. #3173

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Terminate unsuccessfully on error as default for --fatal. Fixes #3172. #3173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Release type: major

Change default of `--fatal` command line switch to terminate on error.
8 changes: 4 additions & 4 deletions pelican/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -525,7 +525,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__)
Expand Down
2 changes: 1 addition & 1 deletion pelican/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def error(self, *args, **kwargs):
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)
Expand Down