mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-30 14:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated logger function to escape message part

Browse Source
This commit is contained in:
bergware
2023-10-02 22:16:23 +02:00
parent cabaa5a437
commit 3903686c5f
15 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/scripts/netconfig
+1 -1
View File
@@ -25,7 +25,7 @@ function update_wireguard($ifname) {
$vtun = basename($wg,'.conf');
// interface has changed?
if (exec("grep -Pom1 ' dev $nic ' $wg")=='') {
exec("logger -t netconfig 'updated wireguard $vtun configuration'");
exec("logger -t netconfig -- \"updated wireguard $vtun configuration\"");
exec("sed -ri 's/ dev (br0|bond0|eth0) / dev $nic /' $wg");
}
// restart active wireguard tunnels
emhttp/plugins/dynamix/scripts/reload_services
+1 -1
View File
@@ -6,7 +6,7 @@ if [[ -n $1 ]]; then
fi
for cmd in $SERVICES; do
if /etc/rc.d/rc.$cmd update; then
logger -t network "reload service: $cmd"
logger -t network -- "reload service: $cmd"
/etc/rc.d/rc.$cmd reload >/dev/null 2>&1
fi
done
emhttp/plugins/dynamix/scripts/update_services
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/bash
lock=/tmp/atlock.tmp
logger -t network "update services: ${1:-1}s"
logger -t network -- "update services: ${1:-1}s"
rm -f $lock
echo "sleep ${1:-1};/usr/local/emhttp/webGui/scripts/reload_services $lock"|at -M now 2>/dev/null
exit 0
emhttp/plugins/dynamix/scripts/upnp_poller
+1 -1
View File
@@ -34,7 +34,7 @@ while :; do
IP=$(ip -4 addr show dev $LINK|grep -Pom1 'inet \K.[^/]+')
PORT=$(wg show $WG listen-port)
upnpc -u $XML -m $LINK -e "WireGuard-$WG" -a $IP $PORT $PORT udp >/dev/null 2>&1
[[ $? -eq 0 ]] && logger -t upnpc "Added port $PORT/udp" || logger -t upnpc "Failed to add port $PORT/udp"
[[ $? -eq 0 ]] && logger -t upnpc -- "Added port $PORT/udp" || logger -t upnpc -- "Failed to add port $PORT/udp"
fi
done
fi
emhttp/plugins/dynamix/scripts/upnp_port
+4 -4
View File
@@ -38,18 +38,18 @@ add)
upnpc -u $XML -m $LINK -e $3 -a $4 $5 $6 $7 >/dev/null 2>&1
if [[ $? -eq 0 ]]; then
[[ -n $WG ]] && at -M -f ${POLLER}_start now 2>/dev/null
logger -t upnpc "Added port $5/$7"
logger -t upnpc -- "Added port $5/$7"
else
logger -t upnpc "Failed to add port $5/$7"
logger -t upnpc -- "Failed to add port $5/$7"
fi
;;
del)
upnpc -u $XML -m $LINK -d $3 $4 >/dev/null 2>&1
if [[ $? -eq 0 ]]; then
[[ -z $WG && -n $(pgrep -f $POLLER) ]] && pkill -f $POLLER
logger -t upnpc "Deleted port $3/$4"
logger -t upnpc -- "Deleted port $3/$4"
else
logger -t upnpc "Failed to delete port $3/$4"
logger -t upnpc -- "Failed to delete port $3/$4"
fi
;;
esac