Merge pull request #310 from akrherz/emailz

Address thread safety issue

Author: akrherz

.pre-commit-config.yaml

@@ -10,14 +10,14 @@ repos:
         types: [python]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.3"
+    rev: "v0.14.4"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 'v2.11.0'
+    rev: 'v2.11.1'
     hooks:
       - id: pyproject-fmt
 

pyproject.toml

@@ -19,11 +19,11 @@ authors = [
 ]
 classifiers = [
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 dynamic = [
   "version",

src/pywwa/common.py

@@ -7,6 +7,7 @@
 import os
 import socket
 import sys
+import threading
 import traceback
 from email.mime.text import MIMEText
 from io import StringIO
@@ -27,6 +28,7 @@
 # http://bugs.python.org/issue7980
 datetime.datetime.strptime("2013", "%Y")
 EMAIL_TIMESTAMPS = []
+EMAIL_TIMESTAMPS_LOCK = threading.Lock()
 
 
 class CustomFormatter(logging.Formatter):
@@ -126,23 +128,28 @@ def load_settings():
         cursor.close()
 
 
-def should_email():
+def should_email() -> bool:
     """Prevent email bombs
 
     Use the setting `pywwa_email_limit` to threshold the number of emails
     permitted within the past hour
 
-    @return boolean if we should email or not
+    Returns:
+        bool: True if an email should be sent, False if not
     """
-    EMAIL_TIMESTAMPS.insert(0, utc())
-    delta = EMAIL_TIMESTAMPS[0] - EMAIL_TIMESTAMPS[-1]
-    email_limit = int(SETTINGS.get("pywwa_email_limit", 10))
-    if len(EMAIL_TIMESTAMPS) < email_limit:
-        return True
-    while len(EMAIL_TIMESTAMPS) > email_limit:
-        EMAIL_TIMESTAMPS.pop()
-
-    return delta > datetime.timedelta(hours=1)
+    with EMAIL_TIMESTAMPS_LOCK:
+        # Insert current timestamp into the beginning of the list
+        EMAIL_TIMESTAMPS.insert(0, utc())
+        # Figure out the amount of time from now to the end of the list
+        delta = EMAIL_TIMESTAMPS[0] - EMAIL_TIMESTAMPS[-1]
+        # Figure out the allowed limit over the hour interval
+        email_limit = int(SETTINGS.get("pywwa_email_limit", 10))
+        if len(EMAIL_TIMESTAMPS) < email_limit:
+            return True
+        while len(EMAIL_TIMESTAMPS) > email_limit:
+            EMAIL_TIMESTAMPS.pop()
+
+        return delta > datetime.timedelta(hours=1)
 
 
 def email_error(exp, message="", trimstr=100):

src/pywwa/data/pirep_navaids.tbl

@@ -4,6 +4,7 @@ MYCC            Cat Cays                         -- BH  2555  -7928     0  0
 # Sites found while parsing real data
 CAA2            Saint Andre Avellin              -- CA  4574  -7507     0  0 
 CAA4            Saint Apollinaire                -- CA  4659  -7156     0  0
+CAA6            Smithers                         BC CA  5478 -12713     0  0
 CAA8            Invermere                        -- CA  5052 -11600     0  0
 CAA9            Port Alberni                     BC CA  4928 -12495     0  0
 CAB3            Bedwell Harbour                  -- CA  4875 -12323     0  0
@@ -449,6 +450,7 @@ CMA2            Mattawa                          ON CA  4630  -7875     0  0
 CMB2            Meadowbank                       -- CA  6503  -9607     0  0
 CMB7            Maxville                         -- CA  4525  -7481     0  0
 CMB9            Port Renfrew Mill Bay            -- CA  4856 -12441     0  0
+CMC5            Blackie McElroy Ranch            AB CA  5063 -11359     0  0
 CMF2            Edmonton Calmar Maplelane        AB CA  5318 -11374     0  0
 CMH3            Lacombe                          AB CA  5238 -11382     0  0
 CML2            Quamichan Lake Raven             BC CA  4882 -12365     0  0

src/pywwa/workflows/spe.py

@@ -14,7 +14,6 @@
 
 def real_process(txn, raw):
     """Do work please"""
-    _sqlraw = raw.replace("\015\015\012", "\n")
     prod = product.TextProduct(raw, ugc_provider={}, utcnow=common.utcnow())
 
     product_id = prod.get_product_id()

util/gen_channels_html_table.py

@@ -320,6 +320,7 @@ def load_dicts():
     nwsli_dict["MLU"] = NWSLI("MLU", lat=32.52, lon=-92.03)
     nwsli_dict["IGB"] = NWSLI("MLU", lat=33.48, lon=-88.52)
     nwsli_dict["MEI"] = NWSLI("MLU", lat=32.38, lon=-88.80)
+    pgconn.close()
 
 
 def do_generic(fh):

util/rotate.py

@@ -23,8 +23,8 @@ def handler(fnbase: str, fmt: str, bio: BytesIO):
 
         # Create the uncompressed version
         bio.seek(0)
-        with gzip.open(bio, "rb") as fh:
-            data = fh.read()
+        with gzip.open(bio, "rb") as gzfp:
+            data = gzfp.read()
         fmt = "tif"
     else:
         data = bio.getvalue()