harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

--no-threads flag for sendalerts command

Browse Source
This commit is contained in:
Pēteris Caune 2017-03-28 20:04:24 +01:00
parent c073cb0b3a
commit 9dcb1678f3
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hc/api/management/commands/sendalerts.py
View File

@ -35,7 +35,15 @@ class Command(BaseCommand):
help='Do not keep running indefinitely in a 2 second wait loop', help='Do not keep running indefinitely in a 2 second wait loop',
) )
def handle_one(self): parser.add_argument(
'--no-threads',
action='store_false',
dest='use_threads',
default=False,
help='Send alerts synchronously, without using threads',
)
def handle_one(self, use_threads=True):
""" Process a single check. """ """ Process a single check. """
now = timezone.now() now = timezone.now()
@ -65,15 +73,20 @@ class Command(BaseCommand):
if num_updated == 1: if num_updated == 1:
# Send notifications only if status update succeeded # Send notifications only if status update succeeded
# (no other sendalerts process got there first) # (no other sendalerts process got there first)
notify_on_thread(check.id, self.stdout) if use_threads:
notify_on_thread(check.id, self.stdout)
else:
notify(check.id, self.stdout)
return True return True
return False return False
def handle(self, *args, **options): def handle(self, *args, **options):
use_threads = options["use_threads"]
if not options["loop"]: if not options["loop"]:
x = 0 x = 0
while self.handle_one(): while self.handle_one(use_threads):
# returns True when there are more alerts to send. # returns True when there are more alerts to send.
x += 1 x += 1
return "Sent %d alert(s)" % x return "Sent %d alert(s)" % x
@ -83,7 +96,7 @@ class Command(BaseCommand):
ticks = 0 ticks = 0
while True: while True:
while self.handle_one(): while self.handle_one(use_threads):
ticks = 0 ticks = 0
ticks += 1 ticks += 1

19
hc/api/tests/test_sendalerts.py
View File

@ -1,6 +1,7 @@
from datetime import timedelta from datetime import timedelta
from mock import patch from mock import patch
from django.core.management import call_command
from django.utils import timezone from django.utils import timezone
from hc.api.management.commands.sendalerts import Command from hc.api.management.commands.sendalerts import Command
from hc.api.models import Check from hc.api.models import Check
@ -35,7 +36,7 @@ class SendAlertsTestCase(BaseTestCase):
check.refresh_from_db() check.refresh_from_db()
self.assertEqual(check.status, "down") self.assertEqual(check.status, "down")
# It should call `notify` # It should call `notify_on_thread`
self.assertTrue(mock_notify.called) self.assertTrue(mock_notify.called)
@patch("hc.api.management.commands.sendalerts.notify_on_thread") @patch("hc.api.management.commands.sendalerts.notify_on_thread")
@ -54,7 +55,7 @@ class SendAlertsTestCase(BaseTestCase):
check.refresh_from_db() check.refresh_from_db()
self.assertEqual(check.status, "up") self.assertEqual(check.status, "up")
# It should call `notify` # It should call `notify_on_thread`
self.assertTrue(mock_notify.called) self.assertTrue(mock_notify.called)
# alert_after now should be set # alert_after now should be set
@ -78,5 +79,17 @@ class SendAlertsTestCase(BaseTestCase):
# alert_after should have been increased # alert_after should have been increased
self.assertTrue(check.alert_after > check.last_ping) self.assertTrue(check.alert_after > check.last_ping)
# notify should *not* have been called # notify_on_thread should *not* have been called
self.assertFalse(mock_notify.called) self.assertFalse(mock_notify.called)
@patch("hc.api.management.commands.sendalerts.notify")
def test_it_works_synchronously(self, mock_notify):
check = Check(user=self.alice, status="up")
check.last_ping = timezone.now() - timedelta(days=2)
check.alert_after = check.get_alert_after()
check.save()
call_command("sendalerts", loop=False, use_threads=False)
# It should call `notify` instead of `notify_on_thread`
self.assertTrue(mock_notify.called)