diff options
author | Pat Riehecky <riehecky@fnal.gov> | 2020-11-09 13:25:29 -0600 |
---|---|---|
committer | Pat Riehecky <riehecky@fnal.gov> | 2020-11-09 13:25:29 -0600 |
commit | 5dbacc5e41b201ad4a41c49b3feecc6420308f81 (patch) | |
tree | 9aa71853c06b7e4ce85680c05676966c0fb861ce /utils | |
parent | 499eee4d069c34bb986324771ff95d391550ac31 (diff) | |
download | novnc-5dbacc5e41b201ad4a41c49b3feecc6420308f81.tar.gz |
Make timeouts/heartbeats easy to setup
Diffstat (limited to 'utils')
-rwxr-xr-x | utils/launch.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/utils/launch.sh b/utils/launch.sh index 4cb6fc2..c07c369 100755 --- a/utils/launch.sh +++ b/utils/launch.sh @@ -27,6 +27,12 @@ usage() { echo " " echo " --record FILE Record traffic to FILE.session.js" echo " " + echo " --heartbeat SEC send a ping to the client every SEC seconds" + echo " --timeout SEC after SEC seconds exit when not connected" + echo " --idle-timeout SEC server exits after SEC seconds if there are no" + echo " active connections" + + echo " " exit 2 } @@ -41,6 +47,9 @@ WEB="" proxy_pid="" SSLONLY="" RECORD_ARG="" +HEARTBEAT_ARG="" +IDLETIMEOUT_ARG="" +TIMEOUT_ARG="" die() { echo "$*" @@ -70,6 +79,9 @@ while [ "$*" ]; do --web) WEB="${OPTARG}"; shift ;; --ssl-only) SSLONLY="--ssl-only" ;; --record) RECORD_ARG="--record ${OPTARG}"; shift ;; + --heartbeat) HEARTBEAT_ARG="--heartbeat ${OPTARG}"; shift ;; + --idle-timeout) IDLETIMEOUT_ARG="--idle-timeout ${OPTARG}"; shift ;; + --timeout) TIMEOUT_ARG="--timeout ${OPTARG}"; shift ;; -h|--help) usage ;; -*) usage "Unknown chrooter option: ${param}" ;; *) break ;; @@ -162,7 +174,7 @@ fi echo "Starting webserver and WebSockets proxy on port ${PORT}" #${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & -${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${RECORD_ARG} & +${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} & proxy_pid="$!" sleep 1 if ! ps -p ${proxy_pid} >/dev/null; then |