-
-
Notifications
You must be signed in to change notification settings - Fork 139
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.
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
fix - kill network capture process if any container is killed #361
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -362,13 +362,16 @@ def wait_until_interrupt(virtual_machine_container_reset_factory_time_seconds, c | |
# start containers based on selected modules | ||
start_containers(configuration) | ||
if not new_network_events_thread.is_alive(): | ||
return error(messages["interrupt_application"]) | ||
error(messages["interrupt_application"]) | ||
return True | ||
|
||
if containers_are_unhealthy(configuration): | ||
return error( | ||
error( | ||
"Interrupting the application because \"{0}\" container(s) is(are) not alive!".format( | ||
", ".join(containers_are_unhealthy(configuration)) | ||
) | ||
) | ||
return True | ||
if run_as_test: | ||
break | ||
except KeyboardInterrupt: | ||
|
@@ -884,6 +887,9 @@ def load_honeypot_engine(): | |
) | ||
# killed the network traffic capture process by ctrl + c... waiting to end. | ||
info(messages["killing_capture_process"]) | ||
if exit_flag: | ||
# Terminate the network capture process | ||
network_traffic_capture_process.terminate() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should do the job right without the above changes? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nopes, we need a exit flag value which denotes this has exited |
||
if run_as_test: | ||
network_traffic_capture_process.terminate() | ||
# without ci it will be terminate after a few seconds, it needs to kill the tshark and update pcap file collection | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return in a while loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Return error("")
Is returning None
So we need to return True in failing cases
We can break the while loop and at the end return True
What say @dhirensr ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can't use break there. sounds like a use case for break?