mirrors/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2026-09-19 14:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Clear service logs on startup (#1281)

Browse Source
This commit is contained in:
Kroese
2026-07-17 06:26:25 +02:00
committed by GitHub
parent 797411ae7f
commit 5c3fed1387
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.sh
+9 -6
View File
@@ -13,12 +13,13 @@ CHR_PORT=$(strip "$CHR_PORT")
WSD_PORT=$(strip "$WSD_PORT") WSD_PORT=$(strip "$WSD_PORT")
WEB_PID="/run/nginx.pid" WEB_PID="/run/nginx.pid"
WSD_LOG="/var/log/websocketd.log"
WSD_PID="$QEMU_DIR/websocketd.pid" WSD_PID="$QEMU_DIR/websocketd.pid"
prepareWebFiles() { prepareWebFiles() {
cp -r /var/www/* "$QEMU_DIR" || return 1 cp -r /var/www/* "$QEMU_DIR" || return 1
rm -f "$WSD_PID" "$WEB_PID" || return 1 rm -f "$WSD_PID" "$WEB_PID" "$WSD_LOG" || return 1
return 0 return 0
} }
@@ -62,11 +63,13 @@ startWebServer() {
startWebsocketServer() { startWebsocketServer() {
local log="/var/log/websocketd.log"
rm -f "$log"
# Start websocket server # Start websocket server
websocketd --address 127.0.0.1 --port="$WSD_PORT" /run/socket.sh > "$log" 2>&1 & websocketd \
--address 127.0.0.1 \
--port="$WSD_PORT" \
/run/socket.sh \
>"$WSD_LOG" 2>&1 &
local pid=$! local pid=$!
if ! echo "$pid" > "$WSD_PID"; then if ! echo "$pid" > "$WSD_PID"; then
@@ -78,7 +81,7 @@ startWebsocketServer() {
if ! isAlive "$pid"; then if ! isAlive "$pid"; then
rm -f "$WSD_PID" rm -f "$WSD_PID"
[ -s "$log" ] && cat "$log" >&2 [ -s "$WSD_LOG" ] && cat "$WSD_LOG" >&2
error "Failed to start websocket server!" error "Failed to start websocket server!"
return 1 return 1
fi fi