vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes timezone issue in publishing

Browse Source 
Ref: Issue https://github.com/jokob-sk/NetAlertX/issues/1204
This commit is contained in:
Ingo Ratsdorf
2025-09-28 17:29:21 +13:00
parent 06c38322ed
commit af986aa540
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front/plugins/_publisher_mqtt/mqtt.py
View File

@@ -10,6 +10,7 @@ import paho.mqtt.client as mqtt
# from paho.mqtt import client as mqtt_client # from paho.mqtt import client as mqtt_client
# from paho.mqtt import CallbackAPIVersion as mqtt_CallbackAPIVersion # from paho.mqtt import CallbackAPIVersion as mqtt_CallbackAPIVersion
import hashlib import hashlib
from pytz import timezone
# Register NetAlertX directories # Register NetAlertX directories
@@ -25,7 +26,7 @@ from logger import mylog, Logger
from helper import timeNowTZ, get_setting_value, bytes_to_string, \ from helper import timeNowTZ, get_setting_value, bytes_to_string, \
sanitize_string, normalize_string sanitize_string, normalize_string
from database import DB, get_device_stats from database import DB, get_device_stats
from pytz import timezone
# Make sure the TIMEZONE for logging is correct # Make sure the TIMEZONE for logging is correct
conf.tz = timezone(get_setting_value('TIMEZONE')) conf.tz = timezone(get_setting_value('TIMEZONE'))
@@ -561,7 +562,7 @@ def prepTimeStamp(datetime_str):
# If the parsed datetime is naive (i.e., does not contain timezone info), add UTC timezone # If the parsed datetime is naive (i.e., does not contain timezone info), add UTC timezone
if parsed_datetime.tzinfo is None: if parsed_datetime.tzinfo is None:
parsed_datetime = parsed_datetime.replace(tzinfo=conf.tz) parsed_datetime = conf.tz.localize(parsed_datetime)
except ValueError: except ValueError:
mylog('verbose', [f"[{pluginName}] Timestamp conversion failed of string '{datetime_str}'"]) mylog('verbose', [f"[{pluginName}] Timestamp conversion failed of string '{datetime_str}'"])