Skip to content

Commit

Permalink
Merge pull request #786 from j-f1/patch-2 --autopull
Browse files Browse the repository at this point in the history
Add ability for MS to kill the Smokey instance
  • Loading branch information
ferrybig committed May 26, 2017
2 parents 81cdfd5 + 1e8892b commit 49742ea
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions metasmoke.py
Expand Up @@ -86,6 +86,8 @@ def handle_websocket_data(data):
if isinstance(message, Iterable):
if "message" in message:
GlobalVars.charcoal_hq.send_message(message['message'])
elif "exit" in message:
os._exit(message["exit"])
elif "blacklist" in message:
datahandling.add_blacklisted_user((message['blacklist']['uid'], message['blacklist']['site']),
"metasmoke", message['blacklist']['post'])
Expand Down

0 comments on commit 49742ea

Please sign in to comment.