From 81745a35fc8a9acca98b478d05ad73c8efe66bb6 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 10 Nov 2022 18:01:29 +0100 Subject: [PATCH] feat(alerts): fixed query generator feat(alerts): recreate cursor after error --- ee/api/chalicelib/core/alerts_processor.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ee/api/chalicelib/core/alerts_processor.py b/ee/api/chalicelib/core/alerts_processor.py index 0a8df1c02..2ca38e32f 100644 --- a/ee/api/chalicelib/core/alerts_processor.py +++ b/ee/api/chalicelib/core/alerts_processor.py @@ -147,9 +147,9 @@ def Build(a): "timestamp_sub2": TimeUTC.now() - 2 * a["options"]["currentPeriod"] * 60 * 1000} else: sub1 = f"""{subQ} AND timestamp>=%(startDate)s - AND datetime<=toDateTime(%(now)s/1000) - {"AND sessions.start_ts >= %(startDate)s" if j_s else ""} - {"AND sessions.start_ts <= %(now)s" if j_s else ""}""" + AND timestamp<=%(now)s + {"AND sessions.start_ts >= %(startDate)s" if j_s else ""} + {"AND sessions.start_ts <= %(now)s" if j_s else ""}""" params["startDate"] = TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000 sub2 = f"""{subQ} AND timestamp<%(startDate)s AND timestamp>=%(timestamp_sub2)s @@ -203,8 +203,10 @@ def process(): notifications.append(generate_notification(alert, result)) except Exception as e: logging.error(f"!!!Error while running alert query for alertId:{alert['alertId']}") - logging.error(str(e)) logging.error(query) + print("------------") + logging.error(e) + cur = cur.recreate() if len(notifications) > 0: cur.execute( cur.mogrify(f"""UPDATE public.Alerts