cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup + log fixes

Browse Source
This commit is contained in:
Jokob-sk
2024-03-11 07:57:49 +11:00
parent 8817f8d0e9
commit 27ae11c1bc
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
front/maintenance.php
View File

@@ -787,11 +787,10 @@ function scrollDown()
{ {
setTimeout(() => { setTimeout(() => {
var anchor = getUrlAnchor() var elementToCheck = $("#tab_Logging_id");
console.log(anchor) // Check if the parent <li> is active
if (elementToCheck.parent().hasClass("active")) {
if (anchor == "tab_Logging")
{ {
var areaIDs = ['pialert_log', 'pialert_front_log', 'IP_changes_log', 'stdout_log', 'stderr_log', 'pialert_pholus_log', 'pialert_pholus_lastrun_log', 'pialert_php_log']; var areaIDs = ['pialert_log', 'pialert_front_log', 'IP_changes_log', 'stdout_log', 'stderr_log', 'pialert_pholus_log', 'pialert_pholus_lastrun_log', 'pialert_php_log'];
@@ -806,6 +805,7 @@ function scrollDown()
} }
} }
}
}, 100); }, 100);

2
front/plugins/newdev_template/config.json
View File

@@ -132,7 +132,7 @@
{ {
"name" : "value", "name" : "value",
"type" : "sql", "type" : "sql",
"value" : "SELECT DISTINCT dev_DeviceType as id, dev_DeviceType as name FROM Devices " "value" : "SELECT '' as id, '' as name UNION SELECT dev_DeviceType as id, dev_DeviceType as name FROM (SELECT dev_DeviceType FROM Devices UNION SELECT 'Smartphone' UNION SELECT 'Tablet' UNION SELECT 'Laptop' UNION SELECT 'PC' UNION SELECT 'Printer' UNION SELECT 'Server' UNION SELECT 'NAS' UNION SELECT 'Domotic' UNION SELECT 'Game Console' UNION SELECT 'SmartTV' UNION SELECT 'Clock' UNION SELECT 'House Appliance' UNION SELECT 'Phone' UNION SELECT 'AP' UNION SELECT 'Gateway' UNION SELECT 'Firewall' UNION SELECT 'Switch' UNION SELECT 'WLAN' UNION SELECT 'Router' UNION SELECT 'Other') AS all_devices ORDER BY id;"
}, },
{ {
"name" : "uilang", "name" : "uilang",

7
front/plugins/nslookup_scan/nslookup.py
View File

@@ -116,9 +116,14 @@ def execute_nslookup (ip, timeout):
return domain_name, dns_server return domain_name, dns_server
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
# An error occured, handle it # An error occurred, handle it
if "NXDOMAIN" in e.output.decode():
mylog('verbose', [f'[{pluginName}]', f"No PTR record found for IP: {ip}"])
else:
mylog('verbose', [f'[{pluginName}]', e.output]) mylog('verbose', [f'[{pluginName}]', e.output])
# Handle other errors here
# mylog('verbose', [f'[{pluginName}] ⚠ ERROR - check logs']) # mylog('verbose', [f'[{pluginName}] ⚠ ERROR - check logs'])
except subprocess.TimeoutExpired as timeErr: except subprocess.TimeoutExpired as timeErr:
mylog('verbose', [f'[{pluginName}] TIMEOUT - the process forcefully terminated as timeout reached']) mylog('verbose', [f'[{pluginName}] TIMEOUT - the process forcefully terminated as timeout reached'])