From 969cae0343e27d828ede0a9f1e5b2f7573dec888 Mon Sep 17 00:00:00 2001 From: Data-Monkey Date: Sat, 3 Jun 2023 21:56:10 +1000 Subject: [PATCH] send_webhook fixed parameters --- pialert/__main__.py | 7 ++----- pialert/reporting.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pialert/__main__.py b/pialert/__main__.py index 426bb320..26d1173f 100755 --- a/pialert/__main__.py +++ b/pialert/__main__.py @@ -75,7 +75,7 @@ main structure of Pi Alert def main (): mylog('debug', ['[MAIN] Setting up ...']) - + conf.time_started = datetime.datetime.now() conf.cycle = "" conf.check_report = [1, "internet_IP", "update_vendors_silent"] @@ -119,17 +119,14 @@ def main (): #=============================================================================== # This is the main loop of Pi.Alert #=============================================================================== - mylog('debug', ['[Import Config TEST outside loop] lastImportedConfFile :', conf.lastImportedConfFile]) - while True: # update time started time_started = datetime.datetime.now() # not sure why we need this ... loop_start_time = timeNow() - mylog('debug', '[MAIN] Stating loop') + mylog('debug', '[MAIN] Starting loop') # re-load user configuration and plugins - mylog('debug', ['[Import Config TEST inside loop] lastImportedConfFile :', conf.lastImportedConfFile]) importConfigs(db) # check if new version is available / only check once an hour diff --git a/pialert/reporting.py b/pialert/reporting.py index 933ce65f..7a078dc0 100644 --- a/pialert/reporting.py +++ b/pialert/reporting.py @@ -285,7 +285,7 @@ def send_notifications (db, INCLUDED_SECTIONS = conf.INCLUDED_SECTIONS): if conf.REPORT_WEBHOOK and check_config('webhook'): updateState(db,"Send: Webhook") mylog('info', ['[Notification] Sending report by Webhook']) - send_webhook (json_final, mail_text) + send_webhook (msg) else : mylog('verbose', ['[Notification] Skip webhook']) if conf.REPORT_NTFY and check_config('ntfy'):