fix: improve web runtime resolution and restore x11vnc ncache
This commit is contained in:
+18
-2
@@ -4,7 +4,7 @@ set -euo pipefail
|
||||
TARGET_URL="${TARGET_URL:-https://example.com}"
|
||||
SESSION_ID="${SESSION_ID:-unknown}"
|
||||
IDLE_TIMEOUT="${IDLE_TIMEOUT:-1800}"
|
||||
X11VNC_FLAGS="${X11VNC_FLAGS:--wait 5 -defer 5 -ncache 10 -ncache_cr -threads}"
|
||||
X11VNC_FLAGS="${X11VNC_FLAGS:--wait 5 -defer 5 -ncache 10 -threads}"
|
||||
ENABLE_HEARTBEAT="${ENABLE_HEARTBEAT:-1}"
|
||||
TOUCH_PATH="${TOUCH_PATH:-/api/sessions/${SESSION_ID}/touch}"
|
||||
UNIVERSAL_WEB="${UNIVERSAL_WEB:-0}"
|
||||
@@ -183,6 +183,22 @@ else
|
||||
>/tmp/chromium.log 2>&1 &
|
||||
fi
|
||||
|
||||
x11vnc -display :1 -rfbport 5900 -forever -shared -nopw -noxdamage $X11VNC_FLAGS >/tmp/x11vnc.log 2>&1 &
|
||||
start_x11vnc_with_retry() {
|
||||
local display_arg="$1"
|
||||
local attempt=0
|
||||
while [ "$attempt" -lt 12 ]; do
|
||||
x11vnc -display "$display_arg" -rfbport 5900 -forever -shared -nopw -noxdamage $X11VNC_FLAGS >/tmp/x11vnc.log 2>&1 &
|
||||
local pid=$!
|
||||
sleep 1
|
||||
if kill -0 "$pid" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
attempt=$((attempt + 1))
|
||||
sleep 0.5
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
start_x11vnc_with_retry ":1" || true
|
||||
|
||||
exec websockify --verbose --idle-timeout="$IDLE_TIMEOUT" --web=/opt/portal 6080 localhost:5900
|
||||
|
||||
Reference in New Issue
Block a user