From 57b4f2e52ceac4d81bdbd4c5c87df8f4dcbbfac4 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 21 Nov 2024 15:20:54 -0500
Subject: [PATCH] Tweaks

---
 docker/stacks/mqtt-ingest-radio-spots.docker-compose.yaml | 4 ++--
 scripts/rbn-to-mqtt                                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/stacks/mqtt-ingest-radio-spots.docker-compose.yaml b/docker/stacks/mqtt-ingest-radio-spots.docker-compose.yaml
index f43a7c8..e8bdd62 100644
--- a/docker/stacks/mqtt-ingest-radio-spots.docker-compose.yaml
+++ b/docker/stacks/mqtt-ingest-radio-spots.docker-compose.yaml
@@ -6,7 +6,7 @@ services:
     restart: unless-stopped
     env_file: .env
     environment:
-      - Mode=cw
+      - MODE=cw
       - MQTT_HOST=${MQTT_HOST}
   
   rbn_ft8_to_mqtt:
@@ -16,5 +16,5 @@ services:
     restart: unless-stopped
     env_file: .env
     environment:
-      - Mode=ft8
+      - MODE=ft8
       - MQTT_HOST=${MQTT_HOST}
diff --git a/scripts/rbn-to-mqtt b/scripts/rbn-to-mqtt
index 91e7605..1584d10 100755
--- a/scripts/rbn-to-mqtt
+++ b/scripts/rbn-to-mqtt
@@ -6,7 +6,7 @@ import socket
 import re
 import json
 import paho.mqtt.client as mqtt # pip install paho-mqtt
-from datetime import datetime
+from datetime import datetime, UTC
 
 logger = logging.getLogger(__name__)
 RBN_SPOT_RE = re.compile(r"DX de (?P<spotter>[A-Z\d]+(?:-\d+)?)[^\d]+(?P<frequency>[\d\.]+)\s+(?P<spotted>[A-Z\d\/]+)\s+(?P<mode>[A-Z\d]+)\s+(?P<db>[a-zA-Z\d\-]+) dB\s+(?P<notes>(?:[A-Z]+\d+)|(?:\d+ WPM))?[^\d]+(?P<time>\d+Z)")
@@ -58,7 +58,7 @@ def main() -> int:
             values = match.groupdict()
             
             # Parse the timestamp into something more useful
-            utc_now = datetime.utcnow()
+            utc_now = datetime.now(UTC)
             timestamp = datetime(utc_now.year, utc_now.month, utc_now.day, int(values["time"][:2]), int(values["time"][2:4]), 0)
             
             # Sanitize into a new dict