Fix bugs

OriginProtocol · Sep 7, 2023 · 4ebaa1d · 4ebaa1d
1 parent 2267243
commit 4ebaa1d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/eagleproject/notify/events/__init__.py b/eagleproject/notify/events/__init__.py
@@ -205,8 +205,8 @@ def event_low(title, details, stamp=datetime.utcnow(), tags=None,
 
 
 def seen_filter(events):
-    """ Filter out any events seen since `since` and add newly discovered hashes
-    to the DB """
+    """ Filter out any events seen since `event.deduplicate_time_window` and 
+    add newly discovered hashes to the DB """
     filtered = []
     events_parsed = []
 
@@ -221,7 +221,7 @@ def seen_filter(events):
 
         _, created = EventSeen.objects.get_or_create(
             event_hash=event_hash,
-            last_seen__gt=datetime.now(tz=timezone) - ev.deduplicate_time_window,
+            last_seen__gt=datetime.now(tz=timezone.utc) - ev.deduplicate_time_window,
             defaults={
                 'event_hash': event_hash,
                 'last_seen': datetime.now(tz=timezone.utc)

diff --git a/eagleproject/notify/triggers/vault_oracle.py b/eagleproject/notify/triggers/vault_oracle.py
@@ -67,19 +67,24 @@ def run_trigger(transfers, new_transfers):
                 except AssertionError as e:
                     events.append(
                         event_high(
-                            "Exceptional Oracle Price    🧙‍♀️", str(e),
+                            "Exceptional Oracle Price    🧙‍♀️", 
+                            str(e),
                             deduplicate_time_window=DEDUPE_WINDOW_SECONDS,
                         )
                     )
                     continue
                 except RPCError as e:
                     print("RPC Error when reading price for {}".format(symbol), e)
-                    sleep(3)
-                    if retries <= 0:
+                    if "below peg" in e.message or retries <= 0:
                         events.append(
                             event_high(
-                                "RPC Error when reading price for {}    🔴".format(symbol), str(e)),
+                                "RPC Error when reading price for {}    🔴".format(symbol), 
+                                str(e),
                                 deduplicate_time_window=DEDUPE_WINDOW_SECONDS,
-                            )
+                            ),
+                        )
+                        break
+                    elif retries > 0:
+                        sleep(3)
 
     return events
diff --git a/eagleproject/notify/views.py b/eagleproject/notify/views.py
@@ -19,7 +19,7 @@ def gc(request):
     # event_seen is time sensitive and old entries are irrelevant
     try:
         EventSeen.objects.filter(
-            last_seen__gt=datetime.utcnow() - timedelta(hours=2)
+            last_seen__gt=datetime.utcnow() - timedelta(hours=24)
         ).delete()
     except Exception:
         log.exception(

diff --git a/eagleproject/scripts/gc.py b/eagleproject/scripts/gc.py
@@ -11,7 +11,7 @@ def run():
     # event_seen is time sensitive and old entries are irrelevant
     try:
         EventSeen.objects.filter(
-            last_seen__gt=datetime.utcnow() - timedelta(hours=2)
+            last_seen__gt=datetime.utcnow() - timedelta(hours=24)
         ).delete()
     except Exception:
         log.exception(