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

MERGE: resolve conflicts

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2025-11-10 10:11:34 +11:00
parent c5a1f19567 9f6086e5cf
commit a98bac331d
77 changed files with 1670 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/logger.py
View File

@@ -4,20 +4,17 @@ import datetime
import threading
import queue
import logging
from zoneinfo import ZoneInfo
# Register NetAlertX directories
INSTALL_PATH="/app"
sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
# NetAlertX imports
import conf
from const import *
# -------------------------------------------------------------------------------
# duplication from helper to avoid circle
# -------------------------------------------------------------------------------
def timeNowTZ():
if conf.tz:
return datetime.datetime.now(conf.tz).replace(microsecond=0)
else:
return datetime.datetime.now().replace(microsecond=0)
from utils.datetime_utils import timeNowTZ
# -------------------------------------------------------------------------------