updated healthchecks to support starting and stopping a job
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
jblu 2024-06-03 20:32:57 -05:00
parent 708d56fc98
commit d15cc8d95c
5 changed files with 114 additions and 100 deletions

View File

@ -17,7 +17,6 @@ steps:
- main - main
event: event:
- push - push
- pull_request
- name: docker-test - name: docker-test
image: plugins/docker image: plugins/docker
settings: settings:
@ -34,7 +33,6 @@ steps:
- dev* - dev*
event: event:
- push - push
- pull_request
- name: test-main - name: test-main
image: git.jonb.io/jblu/qbit-maid:latest image: git.jonb.io/jblu/qbit-maid:latest
commands: commands:
@ -45,7 +43,6 @@ steps:
- main - main
event: event:
- push - push
- pull_request
- name: test-dev - name: test-dev
image: git.jonb.io/jblu/qbit-maid:dev image: git.jonb.io/jblu/qbit-maid:dev
commands: commands:
@ -56,4 +53,3 @@ steps:
- dev* - dev*
event: event:
- push - push
- pull_request

View File

@ -94,6 +94,11 @@ class Qbt:
tor_log(self) tor_log(self)
tor_notify(self) tor_notify(self)
self.t = time self.t = time
#start healthcheck job
if self.use_healthcheck:
send_ping(self, r, self.healthcheck_url.rstrip("/") + "/start" )
# Pulling domain names to treat carefully # Pulling domain names to treat carefully
self.tracker_list = [] self.tracker_list = []
self.up_tor_counter = 0 self.up_tor_counter = 0

View File

@ -88,7 +88,7 @@ def get_script_runtime(self):
def send_ping(self, req_obj, healthcheck_url): def send_ping(self, req_obj, healthcheck_url):
try: try:
req_obj.get(healthcheck_url, timeout=10) req_obj.get(healthcheck_url, timeout=5)
except req_obj.RequestException as e: except req_obj.RequestException as e:
self.tl.info(f"Ping failed: {e}") self.tl.info(f"Ping failed: {e}")

View File

@ -1,6 +1,8 @@
import unittest import unittest
import requests as r
from qlist import is_preme,is_cat_ignored,is_tracker_blank,is_protected_tracker,is_not_protected_tracker,is_tag_blank,is_ignored_tag from qlist import is_preme,is_cat_ignored,is_tracker_blank,is_protected_tracker,is_not_protected_tracker,is_tag_blank,is_ignored_tag
from qprocess import is_downloading,is_protected_under_ratio,is_old_tor,is_protected_over_ratio,is_not_protected_tor from qprocess import is_downloading,is_protected_under_ratio,is_old_tor,is_protected_over_ratio,is_not_protected_tor
from qlogging import send_ping
class TestQbitmaid(unittest.TestCase): class TestQbitmaid(unittest.TestCase):
def test_ispreme_sanity(self): def test_ispreme_sanity(self):
@ -94,6 +96,17 @@ class TestQbitmaid(unittest.TestCase):
def test_isignoredtag(self): def test_isignoredtag(self):
self.assertTrue(is_ignored_tag(['save'], 'save,public,ipt')) self.assertTrue(is_ignored_tag(['save'], 'save,public,ipt'))
def test_sendpingstart_sanity(self):
send_ping(self, r, "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb" + "/start")
url = "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb"
send_ping(self, r, url)
def test_sendping_start(self):
url = "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb/"
send_ping(self, r, url.strip("/") + "/start")
send_ping(self, r, "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb")
# def test__sanity(self): # def test__sanity(self):
# pass # pass