Refactor the stop command
#71
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
- try except block in extra function for more readability - added return False if pinfo for an psutilprocess can't be created sucessfully (otherwise pinfo isn't defined for the next block) - Linelenght <=79
check_stop_remove_container Funktion hinzugefügt um Code aus der execute auszulagern
joka921
requested changes
Oct 17, 2024
src/qlever/commands/stop.py
Outdated
| from qlever.command import QleverCommand | ||
| from qlever.commands.status import StatusCommand | ||
| from qlever.containerize import Containerize | ||
| from qlever.log import log | ||
| from qlever.util import show_process_info | ||
|
|
||
|
|
||
| def try_to_kill(proc, pinfo): |
There was a problem hiding this comment.
Try to kill the given process, return true iff it was killed successfully. the process_info is used for logging.
There was a problem hiding this comment.
(Also add documentation for the other functions you extract).
src/qlever/commands/stop.py
Outdated
Comment on lines
97
to
100
| if try_to_kill(proc, pinfo): | ||
| return True | ||
| else: | ||
| return False |
There was a problem hiding this comment.
Suggested change
| if try_to_kill(proc, pinfo): | |
| return True | |
| else: | |
| return False | |
| return try_to_kill(proc, pinfo) |
src/qlever/commands/stop.py
Outdated
| log.info("") | ||
| show_process_info(proc, "", show_heading=True) | ||
| return False | ||
| return True |
There was a problem hiding this comment.
If the return is inside the try:clause, the code is much more readable.
joka921
reviewed
Oct 17, 2024
src/qlever/commands/stop.py
Outdated
| return True | ||
|
|
||
|
|
||
| def check_stop_remove_container(server_container): |
There was a problem hiding this comment.
These two functions should have consistent names, e.g. stop_process and stop_container.
adjust according to changes in origonal stop.py
joka921
approved these changes
Dec 24, 2024
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.
Now several subfunctions are factored out from the rather lengthy
executefunction, in particular for stopping a native binary and for stopping a container.