Skip to content

Commit

Permalink
add entry point and signal handler
Browse files Browse the repository at this point in the history
  • Loading branch information
zetsub0u committed Oct 19, 2015
1 parent 3f21dbe commit 9d6410b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
18 changes: 16 additions & 2 deletions elastalert/elastalert.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import sys
import time
import traceback
import os
import signal
from email.mime.text import MIMEText
from smtplib import SMTP
from smtplib import SMTPException
Expand Down Expand Up @@ -1259,7 +1261,19 @@ def next_alert_time(self, rule, name, timestamp):
return timestamp + wait, exponent


if __name__ == '__main__':
client = ElastAlerter(sys.argv[1:])
def handle_signal(signal, frame):
elastalert_logger.info('SIGINT received, stopping ElastAlert...')
# use os._exit to exit immediately and avoid someone catching SystemExit
os._exit(0)


def main(args=None):
signal.signal(signal.SIGINT, handle_signal)
if not args:
args = sys.argv[1:]
client = ElastAlerter(args)
if not client.args.silence:
client.start()

if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
entry_points={
'console_scripts': ['elastalert-create-index=elastalert.create_index:main',
'elastalert-test-rule=elastalert.test_rule:main',
'elastalert-rule-from-kibana=elastalert.rule_from_kibana:main']},
'elastalert-rule-from-kibana=elastalert.rule_from_kibana:main',
'elastalert=elastalert.elastalert:main']},
packages=find_packages(),
package_data={'elastalert': ['schema.yaml']},
install_requires=[
Expand Down

0 comments on commit 9d6410b

Please sign in to comment.