From 7a43dabc8f5d6466c8bd7b82b93a8bdfb356ea55 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 12 Sep 2023 19:25:01 +0200 Subject: [PATCH] gluon-mesh-vpn-tunneldigger: tunneldigger-watchdog: remove broken restart check The tunneldigger init script has been migrated to procd, so there is no PID file anymore. Remove the obsolete check altogether - it shouldn't be needed anymore, as procd will take care of crashes of tunneldigger by itself. This fixes the watchdog resetting tunneldigger every time it runs. Closes #2977 --- .../luasrc/usr/bin/tunneldigger-watchdog | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/package/gluon-mesh-vpn-tunneldigger/luasrc/usr/bin/tunneldigger-watchdog b/package/gluon-mesh-vpn-tunneldigger/luasrc/usr/bin/tunneldigger-watchdog index e1b55a435c..0f1e5603c1 100755 --- a/package/gluon-mesh-vpn-tunneldigger/luasrc/usr/bin/tunneldigger-watchdog +++ b/package/gluon-mesh-vpn-tunneldigger/luasrc/usr/bin/tunneldigger-watchdog @@ -7,16 +7,6 @@ local function restart_tunneldigger() os.execute('/etc/init.d/tunneldigger restart') end -local function read_pid_file() - local pid_file = io.open('/var/run/tunneldigger.mesh-vpn.pid', 'r') - if not pid_file then - return nil - end - local pid = pid_file:read('*l') - pid_file:close() - return pid -end - local function has_mesh_vpn_neighbours() local handle = io.popen('batctl o', 'r') if not handle then @@ -33,11 +23,6 @@ local function has_mesh_vpn_neighbours() end if uci:get_bool('tunneldigger', 'mesh_vpn', 'enabled') then - if io.popen('pgrep -x /usr/bin/tunneldigger'):read('*l') ~= read_pid_file() then - os.execute('logger -t tunneldigger-watchdog "Process-Pid does not match with pid-File."') - restart_tunneldigger() - return - end if not has_mesh_vpn_neighbours() then os.execute('logger -t tunneldigger-watchdog "No vpn-mesh neighbours found."') restart_tunneldigger()