w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-03-15 12:24:29 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Improve adherence to python coding standards and clear up IDE static analysis warnings

Browse Source
This commit is contained in:
Ian Renton
2026-02-27 19:17:04 +00:00
parent 6b18ec6f88
commit 6982354364
53 changed files with 633 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/cleanup.py
View File

@@ -1,7 +1,6 @@
import logging
from datetime import datetime
from threading import Timer, Event, Thread
from time import sleep
from threading import Event, Thread
import pytz
@@ -12,13 +11,13 @@ class CleanupTimer:
def __init__(self, spots, alerts, web_server, cleanup_interval):
"""Constructor"""
self.spots = spots
self.alerts = alerts
self.web_server = web_server
self.cleanup_interval = cleanup_interval
self.cleanup_timer = None
self._spots = spots
self._alerts = alerts
self._web_server = web_server
self._cleanup_interval = cleanup_interval
self.last_cleanup_time = datetime.min.replace(tzinfo=pytz.UTC)
self.status = "Starting"
self._thread = None
self._stop_event = Event()
def start(self):
@@ -33,7 +32,7 @@ class CleanupTimer:
self._stop_event.set()
def _run(self):
while not self._stop_event.wait(timeout=self.cleanup_interval):
while not self._stop_event.wait(timeout=self._cleanup_interval):
self._cleanup()
def _cleanup(self):
@@ -41,34 +40,34 @@ class CleanupTimer:
try:
# Perform cleanup via letting the data expire
self.spots.expire()
self.alerts.expire()
self._spots.expire()
self._alerts.expire()
# Explicitly clean up any spots and alerts that have expired
for id in list(self.spots.iterkeys()):
for i in list(self._spots.iterkeys()):
try:
spot = self.spots[id]
spot = self._spots[i]
if spot.expired():
self.spots.delete(id)
self._spots.delete(i)
except KeyError:
# Must have already been deleted, OK with that
pass
for id in list(self.alerts.iterkeys()):
for i in list(self._alerts.iterkeys()):
try:
alert = self.alerts[id]
alert = self._alerts[i]
if alert.expired():
self.alerts.delete(id)
self._alerts.delete(i)
except KeyError:
# Must have already been deleted, OK with that
pass
# Clean up web server SSE spot/alert queues
self.web_server.clean_up_sse_queues()
self._web_server.clean_up_sse_queues()
self.status = "OK"
self.last_cleanup_time = datetime.now(pytz.UTC)
except Exception as e:
except Exception:
self.status = "Error"
logging.exception("Exception in Cleanup thread")
self._stop_event.wait(timeout=1)