Catch SIGINT (Ctrl-c) and exit cleanly #75
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mirceaulinic
approved these changes
May 13, 2017
napalm_logs/auth.py
Outdated
| if self.__up is False: | ||
| break | ||
| else: | ||
| raise |
There was a problem hiding this comment.
Please let's raise and catch later the NapalmLogsExit exception (https://github.com/napalm-automation/napalm-logs/blob/master/napalm_logs/exceptions.py#L47) -- unused yet, but defined exactly for this scope :)
napalm_logs/auth.py
Outdated
| @@ -124,11 +129,18 @@ def start(self): | |||
| except ssl.SSLError: | |||
| log.exception('SSL error', exc_info=True) | |||
| continue | |||
| except socket.error: | |||
| if self.__up is False: | |||
| break | |||
napalm_logs/device.py
Outdated
| msg_dict, address = self.pipe.recv() | ||
| except IOError: | ||
| if self.__up is False: | ||
| break |
There was a problem hiding this comment.
Same comments here: return and/or raise NapalmLogsExit
napalm_logs/server.py
Outdated
| msg, address = self.pipe.recv() | ||
| except IOError: | ||
| if self.__up is False: | ||
| break |
I am adding signal to catch `SIGINT` in `cli.py` and not send it to the child processes. When a `SIGINT` is caught, `cli` then calls the `stop_engine` funcion in `napalm_log`, which sends a SIGTERM to each child process. The child process will catch this `SIGTERM` and run it's own `stop` function, while will close all pipes / sockets, and terminate the loop.
|
Addressed all comments and updated. |
mirceaulinic
approved these changes
May 16, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I am adding signal to catch
SIGINTincli.pyand not send it to thechild processes. When a
SIGINTis caught,clithen calls thestop_enginefuncion innapalm_log, which sends a SIGTERM to eachchild process. The child process will catch this
SIGTERMand run it'sown
stopfunction, while will close all pipes / sockets, and terminatethe loop.