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

Fix update check

Browse Source
This commit is contained in:
Joshua P
2023-07-14 12:00:40 +10:00
parent c9bc3e9447
commit 2fc63daf23
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pialert/__main__.py
View File

@@ -81,9 +81,6 @@ def main ():
conf.check_report = [1, "internet_IP", "update_vendors_silent"] conf.check_report = [1, "internet_IP", "update_vendors_silent"]
conf.plugins_once_run = False conf.plugins_once_run = False
pialert_start_time = timeNow()
# to be deleted if not used # to be deleted if not used
conf.log_timestamp = conf.time_started conf.log_timestamp = conf.time_started
#cron_instance = Cron() #cron_instance = Cron()
@@ -115,14 +112,12 @@ def main ():
# Upgrade DB if needed # Upgrade DB if needed
db.upgradeDB() db.upgradeDB()
#=============================================================================== #===============================================================================
# This is the main loop of Pi.Alert # This is the main loop of Pi.Alert
#=============================================================================== #===============================================================================
while True: while True:
# update time started # update time started
time_started = datetime.datetime.now() # not sure why we need this ...
loop_start_time = timeNow() loop_start_time = timeNow()
mylog('debug', '[MAIN] Starting loop') mylog('debug', '[MAIN] Starting loop')
@@ -133,6 +128,7 @@ def main ():
# if newVersionAvailable is already true the function does nothing and returns true again # if newVersionAvailable is already true the function does nothing and returns true again
mylog('debug', [f"[Version check] Last version check timestamp: {last_version_check}"]) mylog('debug', [f"[Version check] Last version check timestamp: {last_version_check}"])
if last_version_check + datetime.timedelta(hours=1) < loop_start_time : if last_version_check + datetime.timedelta(hours=1) < loop_start_time :
last_version_check = loop_start_time
conf.newVersionAvailable = isNewVersion(conf.newVersionAvailable) conf.newVersionAvailable = isNewVersion(conf.newVersionAvailable)
# Handle plugins executed ONCE # Handle plugins executed ONCE
@@ -150,13 +146,13 @@ def main ():
if last_scan_run + datetime.timedelta(minutes=1) < loop_start_time : if last_scan_run + datetime.timedelta(minutes=1) < loop_start_time :
# last time any scan or maintenance/upkeep was run # last time any scan or maintenance/upkeep was run
last_scan_run = time_started last_scan_run = loop_start_time
# Header # Header
updateState(db,"Process: Start") updateState(db,"Process: Start")
# Timestamp # Timestamp
startTime = time_started startTime = loop_start_time
startTime = startTime.replace (microsecond=0) startTime = startTime.replace (microsecond=0)
# Check if any plugins need to run on schedule # Check if any plugins need to run on schedule
@@ -167,14 +163,14 @@ def main ():
# -------------------------------------------- # --------------------------------------------
# check for changes in Internet IP # check for changes in Internet IP
if last_internet_IP_scan + datetime.timedelta(minutes=3) < time_started: if last_internet_IP_scan + datetime.timedelta(minutes=3) < loop_start_time:
conf.cycle = 'internet_IP' conf.cycle = 'internet_IP'
last_internet_IP_scan = time_started last_internet_IP_scan = loop_start_time
check_internet_IP(db) check_internet_IP(db)
# Update vendors once a week # Update vendors once a week
if last_update_vendors + datetime.timedelta(days = 7) < time_started: if last_update_vendors + datetime.timedelta(days = 7) < loop_start_time:
last_update_vendors = time_started last_update_vendors = loop_start_time
conf.cycle = 'update_vendors' conf.cycle = 'update_vendors'
mylog('verbose', ['[MAIN] cycle:',conf.cycle]) mylog('verbose', ['[MAIN] cycle:',conf.cycle])
update_devices_MAC_vendors(db) update_devices_MAC_vendors(db)
@@ -218,8 +214,8 @@ def main ():
performNmapScan(db, get_all_devices(db)) performNmapScan(db, get_all_devices(db))
# Perform a network scan via arp-scan or pihole # Perform a network scan via arp-scan or pihole
if last_network_scan + datetime.timedelta(minutes=conf.SCAN_CYCLE_MINUTES) < time_started: if last_network_scan + datetime.timedelta(minutes=conf.SCAN_CYCLE_MINUTES) < loop_start_time:
last_network_scan = time_started last_network_scan = loop_start_time
conf.cycle = 1 # network scan conf.cycle = 1 # network scan
mylog('verbose', ['[MAIN] cycle:',conf.cycle]) mylog('verbose', ['[MAIN] cycle:',conf.cycle])
updateState(db,"Scan: Network") updateState(db,"Scan: Network")
@@ -277,8 +273,8 @@ def main ():
send_notifications(db) send_notifications(db)
# clean up the DB once an hour # clean up the DB once an hour
if last_cleanup + datetime.timedelta(hours = 1) < time_started: if last_cleanup + datetime.timedelta(hours = 1) < loop_start_time:
last_cleanup = time_started last_cleanup = loop_start_time
conf.cycle = 'cleanup' conf.cycle = 'cleanup'
mylog('verbose', ['[MAIN] cycle:',conf.cycle]) mylog('verbose', ['[MAIN] cycle:',conf.cycle])
db.cleanup_database(startTime, conf.DAYS_TO_KEEP_EVENTS, conf.PHOLUS_DAYS_DATA, conf.HRS_TO_KEEP_NEWDEV) db.cleanup_database(startTime, conf.DAYS_TO_KEEP_EVENTS, conf.PHOLUS_DAYS_DATA, conf.HRS_TO_KEEP_NEWDEV)