From 67430fbfd0c21698f3be346330a3fa906936691c Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 30 Jun 2025 18:51:24 -0400
Subject: [PATCH] Index on created for analyticsgeoevent

---
 peterbecom/base/analytics_referrer_events.py  |  2 +-
 .../0019_alter_analyticsgeoevent_created.py   | 18 ++++++++
 peterbecom/base/models.py                     |  2 +-
 peterbecom/base/tasks.py                      | 44 +++++++++++++++----
 4 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 peterbecom/base/migrations/0019_alter_analyticsgeoevent_created.py

diff --git a/peterbecom/base/analytics_referrer_events.py b/peterbecom/base/analytics_referrer_events.py
index 2ec5aee91..29d623761 100644
--- a/peterbecom/base/analytics_referrer_events.py
+++ b/peterbecom/base/analytics_referrer_events.py
@@ -20,7 +20,7 @@ def create_analytics_referrer_events(max=100, min_hours_old=2):
         .filter(meta__referrer__isnull=False)
         .order_by("-created")
     )
-
+    print(qs.query)
     batch = []
     for event in qs[:max]:
         referrer = event.meta["referrer"]
diff --git a/peterbecom/base/migrations/0019_alter_analyticsgeoevent_created.py b/peterbecom/base/migrations/0019_alter_analyticsgeoevent_created.py
new file mode 100644
index 000000000..237df62f2
--- /dev/null
+++ b/peterbecom/base/migrations/0019_alter_analyticsgeoevent_created.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.3 on 2025-06-30 22:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0018_delete_commandrun'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='analyticsgeoevent',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, db_index=True),
+        ),
+    ]
diff --git a/peterbecom/base/models.py b/peterbecom/base/models.py
index 136badb2f..3b99d19f6 100644
--- a/peterbecom/base/models.py
+++ b/peterbecom/base/models.py
@@ -204,7 +204,7 @@ class AnalyticsGeoEvent(models.Model):
     country = models.CharField(max_length=100, null=True)
     latitude = models.FloatField(null=True)
     longitude = models.FloatField(null=True)
-    created = models.DateTimeField(auto_now_add=True)
+    created = models.DateTimeField(auto_now_add=True, db_index=True)
     lookup = models.JSONField(default=dict)
 
 
diff --git a/peterbecom/base/tasks.py b/peterbecom/base/tasks.py
index 7478c4662..43c760796 100644
--- a/peterbecom/base/tasks.py
+++ b/peterbecom/base/tasks.py
@@ -25,6 +25,34 @@
 from peterbecom.base.xcache_analyzer import get_x_cache
 
 
+def get_full_path(func):
+    return f"{func.__module__}.{func.__qualname__}"
+
+
+def log_task_run(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        t0 = time.time()
+        failed = False
+        try:
+            func(*args, **kwargs)
+        except Exception:
+            failed = True
+        finally:
+            t1 = time.time()
+            if t1 - t0 < 1:
+                took = f"{(t1 - t0) * 1000:.1f}ms"
+            else:
+                took = f"{(t1 - t0):.2f}s"
+            print(
+                f"(Crontab Task) {func.__module__}.{func.__qualname__}",
+                f"{'Failed!' if failed else 'Worked.'}",
+                f"Took {took}. ({timezone.now()})",
+            )
+
+    return wrapper
+
+
 def measure_post_process(func):
     @functools.wraps(func)
     def inner(filepath, url, *args, **kwargs):
@@ -54,6 +82,7 @@ def inner(filepath, url, *args, **kwargs):
 
 
 @periodic_task(crontab(minute="*"))
+@log_task_run
 def run_purge_cdn_urls():
     CDNPurgeURL.purge_old()
     for i in range(3):
@@ -108,6 +137,7 @@ def post_process_after_cdn_purge(url):
 
 
 @periodic_task(crontab(hour="*", minute="3"))
+@log_task_run
 def purge_old_cdnpurgeurls():
     old = timezone.now() - datetime.timedelta(days=30)
     ancient = CDNPurgeURL.objects.filter(created__lt=old)
@@ -116,6 +146,7 @@ def purge_old_cdnpurgeurls():
 
 
 @periodic_task(crontab(hour="*", minute="2"))
+@log_task_run
 def purge_old_postprocessings():
     old = timezone.now() - datetime.timedelta(days=30)
     ancient = PostProcessing.objects.filter(created__lt=old)
@@ -133,6 +164,7 @@ def purge_old_postprocessings():
 
 
 @periodic_task(crontab(minute="*"))
+@log_task_run
 def health_check_to_disk():
     health_file = Path("/tmp/huey_health.json")
     try:
@@ -159,30 +191,26 @@ def health_check_to_disk():
 
 
 @periodic_task(crontab(minute="2"))
+@log_task_run
 def create_analytics_geo_events_backfill():
-    print(
-        "(Debugging Cron) Executing create_analytics_geo_events_backfill",
-        timezone.now(),
-    )
     create_analytics_geo_events(max=1000)
 
 
 @periodic_task(crontab(minute="3"))
+@log_task_run
 def create_analytics_referrer_events_backfill():
-    print(
-        "(Debugging Cron) Executing create_analytics_referrer_events_backfill",
-        timezone.now(),
-    )
     create_analytics_referrer_events(max=1000)
 
 
 @periodic_task(crontab(hour="1", minute="2"))
+@log_task_run
 def delete_old_request_logs():
     old = timezone.now() - datetime.timedelta(days=60)
     RequestLog.objects.filter(created__lt=old).delete()
 
 
 @periodic_task(crontab(hour="1", minute="3"))
+@log_task_run
 def delete_old_analyticsevents():
     old = timezone.now() - datetime.timedelta(days=90)
     AnalyticsEvent.objects.filter(created__lt=old).delete()