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 3 Packages Projects Releases Wiki Activity

AVAHISCAN / mDNS #815

Browse Source
This commit is contained in:
jokob-sk
2024-10-04 12:34:31 +10:00
parent 129cd39ef8
commit 41a72f0292
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
front/plugins/avahi_scan/avahi_scan.py
View File

@@ -142,29 +142,22 @@ def execute_name_lookup(ip, timeout):
return '' return ''
# Function to ensure Avahi and its dependencies are running # Function to ensure Avahi and its dependencies are running
def ensure_avahi_running(): def ensure_avahi_running(attempt=1, max_retries=2):
""" """
Ensure that D-Bus is running and the Avahi daemon is started. Ensure that D-Bus is running and the Avahi daemon is started, with recursive retry logic.
""" """
mylog('verbose', [f'[{pluginName}] Ensuring D-Bus and Avahi daemon are running...']) mylog('verbose', [f'[{pluginName}] Attempt {attempt} - Ensuring D-Bus and Avahi daemon are running...'])
# # Install D-Bus if not already installed
# try:
# subprocess.run(['apk', 'add', 'dbus'], check=True)
# except subprocess.CalledProcessError as e:
# mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to install D-Bus: {e.output}'])
# return
# Check rc-status # Check rc-status
try: try:
subprocess.run(['rc-status'], check=True) subprocess.run(['rc-status'], check=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to check rc-status: {e.output}']) mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to check rc-status: {e.output}'])
return return
# Create OpenRC soft level # Create OpenRC soft level
subprocess.run(['touch', '/run/openrc/softlevel'], check=True) subprocess.run(['touch', '/run/openrc/softlevel'], check=True)
# Add Avahi daemon to runlevel # Add Avahi daemon to runlevel
try: try:
subprocess.run(['rc-update', 'add', 'avahi-daemon'], check=True) subprocess.run(['rc-update', 'add', 'avahi-daemon'], check=True)
@@ -178,19 +171,34 @@ def ensure_avahi_running():
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to start D-Bus: {e.output}']) mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to start D-Bus: {e.output}'])
return return
# Check status # Check Avahi status
status_output = subprocess.run(['rc-service', 'avahi-daemon', 'status'], capture_output=True, text=True) 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()}']) if 'started' in status_output.stdout:
mylog('verbose', [f'[{pluginName}] Avahi Daemon is already running.'])
return
mylog('verbose', [f'[{pluginName}] Avahi Daemon is not running, attempting to start... (Attempt {attempt})'])
# Start the Avahi daemon # Start the Avahi daemon
try: try:
subprocess.run(['rc-service', 'avahi-daemon', 'start'], check=True) subprocess.run(['rc-service', 'avahi-daemon', 'start'], check=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to start Avahi daemon: {e.output}']) mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Failed to start Avahi daemon: {e.output}'])
# Check status after starting
status_output = subprocess.run(['rc-service', 'avahi-daemon', 'status'], capture_output=True, text=True)
if 'started' in status_output.stdout:
mylog('verbose', [f'[{pluginName}] Avahi Daemon successfully started.'])
return return
# Retry if not started and attempts are left
if attempt < max_retries:
mylog('verbose', [f'[{pluginName}] Retrying... ({attempt + 1}/{max_retries})'])
ensure_avahi_running(attempt + 1, max_retries)
else:
mylog('verbose', [f'[{pluginName}] ⚠ ERROR - Avahi Daemon failed to start after {max_retries} attempts.'])
# rc-update add avahi-daemon # rc-update add avahi-daemon
# rc-service avahi-daemon status # rc-service avahi-daemon status
# rc-service avahi-daemon start # rc-service avahi-daemon start