heimdall/core
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[fix] reminding notifications

Browse source
This commit is contained in:
Christian Fraß 2023-06-23 12:55:17 +02:00
parent ad0dbb2a5d
commit d3028549cf
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/logic/main.py
View file

@ -204,7 +204,14 @@ def main():
pass pass
else: else:
### get old state and examine whether the check shall be executed ### get old state and examine whether the check shall be executed
rows = sqlite_query_get( rows1 = sqlite_query_get(
database_path,
"SELECT MIN(timestamp) FROM results WHERE (check_name = :check_name) AND (notification_sent = TRUE);",
{
"check_name": check_data["name"],
}
)
rows2 = sqlite_query_get(
database_path, database_path,
"SELECT timestamp, condition, notification_sent FROM results WHERE (check_name = :check_name) ORDER BY timestamp DESC LIMIT :limit;", "SELECT timestamp, condition, notification_sent FROM results WHERE (check_name = :check_name) ORDER BY timestamp DESC LIMIT :limit;",
{ {
@ -212,13 +219,12 @@ def main():
"limit": (check_data["threshold"] + 1), "limit": (check_data["threshold"] + 1),
} }
) )
if (len(rows) <= 0): if (len(rows2) <= 0):
old_item_state = None old_item_state = None
else: else:
last_notification_timestamp = None
count = 1 count = 1
for row in rows[1:]: for row in rows2[1:]:
if (row[1] == rows[0][1]): if (row[1] == rows2[0][1]):
count += 1 count += 1
else: else:
break break
@ -226,17 +232,11 @@ def main():
count = None count = None
else: else:
pass pass
for row in rows:
if (row[2]):
last_notification_timestamp = row[0]
break
else:
pass
old_item_state = { old_item_state = {
"timestamp": rows[0][0], "timestamp": rows2[0][0],
"condition": condition_decode(rows[0][1]), "condition": condition_decode(rows2[0][1]),
"count": count, "count": count,
"last_notification_timestamp": last_notification_timestamp, "last_notification_timestamp": rows1[0][0],
} }
timestamp = get_current_timestamp() timestamp = get_current_timestamp()