From dc4da5b4c98c9af7e7b73cbea7f1885d213176a8 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Tue, 4 Nov 2025 19:44:30 +1100 Subject: [PATCH] BE/PLG: TZ timestamp work #1251 Signed-off-by: jokob-sk --- server/helper.py | 7 ++++++- server/logger.py | 7 ++++++- test/test_sessions_endpoints.py | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/helper.py b/server/helper.py index 61bec402..f072e7c1 100755 --- a/server/helper.py +++ b/server/helper.py @@ -56,7 +56,12 @@ def timeNowDB(local=True): """ if local: try: - tz = ZoneInfo(conf.tz) if conf.tz else None + if isinstance(conf.tz, datetime.tzinfo): + tz = conf.tz + elif conf.tz: + tz = ZoneInfo(conf.tz) + else: + tz = None except Exception: tz = None return datetime.datetime.now(tz).strftime('%Y-%m-%d %H:%M:%S') diff --git a/server/logger.py b/server/logger.py index da2ae75c..2763d489 100755 --- a/server/logger.py +++ b/server/logger.py @@ -29,7 +29,12 @@ def timeNowDB(local=True): """ if local: try: - tz = ZoneInfo(conf.tz) if conf.tz else None + if isinstance(conf.tz, datetime.tzinfo): + tz = conf.tz + elif conf.tz: + tz = ZoneInfo(conf.tz) + else: + tz = None except Exception: tz = None return datetime.datetime.now(tz).strftime('%Y-%m-%d %H:%M:%S') diff --git a/test/test_sessions_endpoints.py b/test/test_sessions_endpoints.py index e7035d65..5529ab98 100755 --- a/test/test_sessions_endpoints.py +++ b/test/test_sessions_endpoints.py @@ -10,7 +10,7 @@ from datetime import datetime, timedelta INSTALL_PATH = "/app" sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"]) -from helper import timeNowDB, get_setting_value +from helper import timeNowDB, timeNowTZ, get_setting_value from api_server.api_server_start import app @pytest.fixture(scope="session")