diff --git a/back/app.conf b/back/app.conf index 8e1e5d8d..aa70e378 100755 --- a/back/app.conf +++ b/back/app.conf @@ -19,7 +19,7 @@ SCAN_SUBNETS=['192.168.1.0/24 --interface=eth0'] TIMEZONE='Europe/Berlin' -LOADED_PLUGINS = ['ARPSCAN','CSVBCKP','DBCLNP', 'INTRNT','MAINT','NEWDEV','NSLOOKUP','NTFPRCS', 'AVAHISCAN', 'PHOLUS','SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS'] +LOADED_PLUGINS = ['ARPSCAN','CSVBCKP','DBCLNP', 'INTRNT','MAINT','NEWDEV','NSLOOKUP','NTFPRCS', 'AVAHISCAN', 'SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS'] DAYS_TO_KEEP_EVENTS=90 # Used for generating links in emails. Make sure not to add a trailing slash! @@ -28,7 +28,6 @@ REPORT_DASHBOARD_URL='http://netalertx' # Make sure at least these scanners are enabled for new installs, other defaults are taken from the config.json INTRNT_RUN='schedule' ARPSCAN_RUN='schedule' -PHOLUS_RUN='on_new_device' NSLOOKUP_RUN='before_name_updates' # Email diff --git a/front/plugins/avahi_scan/avahi_scan.py b/front/plugins/avahi_scan/avahi_scan.py index 6a48506e..99cb16aa 100755 --- a/front/plugins/avahi_scan/avahi_scan.py +++ b/front/plugins/avahi_scan/avahi_scan.py @@ -41,8 +41,6 @@ def main(): # timeout = get_setting_value('AVAHI_RUN_TIMEOUT') timeout = 20 - - # Create a database connection db = DB() # instance of class DB db.open() @@ -56,7 +54,7 @@ def main(): # Retrieve devices unknown_devices = device_handler.getUnknown() - # # Mock list of devices (replace with actual device_handler.getUnknown() in production) + # Mock list of devices (replace with actual device_handler.getUnknown() in production) # unknown_devices = [ # {'dev_MAC': '00:11:22:33:44:55', 'dev_LastIP': '192.168.1.121'}, # {'dev_MAC': '00:11:22:33:44:56', 'dev_LastIP': '192.168.1.9'}, @@ -181,6 +179,10 @@ def ensure_avahi_running(): mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to start D-Bus: {e.output}']) return + # Check status + status_output = subprocess.run(['rc-service', 'avahi-daemon', 'status'], capture_output=True, text=True) + mylog('verbose', [f'[{pluginName}] Avahi Daemon Status: {status_output.stdout.strip()}']) + # Start the Avahi daemon try: subprocess.run(['rc-service', 'avahi-daemon', 'start'], check=True) @@ -188,10 +190,10 @@ def ensure_avahi_running(): mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to start Avahi daemon: {e.output}']) return - # Check status - status_output = subprocess.run(['rc-service', 'avahi-daemon', 'status'], capture_output=True, text=True) - mylog('verbose', [f'[{pluginName}] Avahi Daemon Status: {status_output.stdout.strip()}']) + # rc-update add avahi-daemon + # rc-service avahi-daemon status + # rc-service avahi-daemon start if __name__ == '__main__': main() diff --git a/server/device.py b/server/device.py index a5d1a1a1..32f5cf77 100755 --- a/server/device.py +++ b/server/device.py @@ -550,7 +550,7 @@ def update_devices_names (db): recordsToUpdate.append ([newName, device['dev_MAC']]) # Print log - mylog('verbose', [f'[Update Device Name] Names Found (DiG/mDNS/NSLOOKUP/NBTSCAN/Pholus): {len(recordsToUpdate)} ({foundmDNSLookup}/{foundDig}/{foundNsLookup}/{foundNbtLookup}/{foundPholus})'] ) + mylog('verbose', [f'[Update Device Name] Names Found (DiG/mDNS/NSLOOKUP/NBTSCAN/Pholus): {len(recordsToUpdate)} ({foundDig}/{foundmDNSLookup}/{foundNsLookup}/{foundNbtLookup}/{foundPholus})'] ) mylog('verbose', [f'[Update Device Name] Names Not Found : {notFound}'] ) # update not found devices with (name not found) diff --git a/server/plugin.py b/server/plugin.py index 2fc72e5e..568137a4 100755 --- a/server/plugin.py +++ b/server/plugin.py @@ -441,7 +441,7 @@ def execute_plugin(db, all_plugins, plugin, pluginsState = plugins_state() ): # check if the subprocess / SQL query failed / there was no valid output if len(sqlParams) == 0: - mylog('none', ['[Plugins] No output received from the plugin ', plugin["unique_prefix"], ' - enable LOG_LEVEL=debug and check logs']) + mylog('none', [f'[Plugins] No output received from the plugin "{plugin["unique_prefix"]}"']) return pluginsState else: mylog('verbose', ['[Plugins] SUCCESS, received ', len(sqlParams), ' entries'])