Skip to content

Refine the timing to raise EVENT_CLI_POST_EXECUTE event and catch SystemExit #199

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

Merged
haroldrandom merged 7 commits into from
Apr 21, 2020
Merged

Refine the timing to raise EVENT_CLI_POST_EXECUTE event and catch SystemExit #199

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c74d697
refine event and catch SystemExit
Apr 21, 2020
33d158f
Make SystemExit be awared in exception_handler
Apr 21, 2020
a765e31
Add parameter args when raise EVENT_CLI_PRE_EXECUTE event
Apr 21, 2020
3759f95
fix exit code
Apr 21, 2020
677e355
revert defailt behavior to raise event EVENT_CLI_PRE_EXECUTE
Apr 21, 2020
e905e5b
refine self.result and exit_code
Apr 21, 2020
e59fb68
refine self.result assignment
Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions knack/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def invoke(self, args, initial_invocation_data=None, out_file=None):
self.logging.configure(args)
logger.debug('Command arguments: %s', args)

self.raise_event(EVENT_CLI_PRE_EXECUTE)
self.raise_event(EVENT_CLI_PRE_EXECUTE, args=args)
if CLI._should_show_version(args):
self.show_version()
self.result = CommandResultItem(None)
Expand All @@ -219,15 +219,20 @@ def invoke(self, args, initial_invocation_data=None, out_file=None):
if cmd_result and cmd_result.result is not None:
formatter = self.output.get_formatter(output_type)
self.output.out(cmd_result, formatter=formatter, out_file=out_file)
self.raise_event(EVENT_CLI_POST_EXECUTE)
except KeyboardInterrupt as ex:
self.result = CommandResultItem(None, error=ex)
exit_code = 1
except Exception as ex: # pylint: disable=broad-except
exit_code = self.exception_handler(ex)
self.result = CommandResultItem(None, error=ex)
except SystemExit as ex:
self.result = CommandResultItem(None, error=ex)
exit_code = ex.code
raise ex
finally:
self.raise_event(EVENT_CLI_POST_EXECUTE)

if self.enable_color:
colorama.deinit()
self.result.exit_code = exit_code
self.result.exit_code = exit_code
return exit_code