ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu: Safer way to run xvfb in openvidu-recording to fix concurrent recordings issue

pull/609/head
cruizba 2021-02-19 18:13:17 +01:00
parent 4d66a5b2a5
commit 2d74acb39d
5 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/docker/openvidu-recording/scripts/composed.sh
View File

@ -50,7 +50,7 @@ fi
touch xvfb.log
chmod 777 xvfb.log
xvfb-run --auto-servernum --server-args="-ac -screen 0 ${RESOLUTION}x24 -noreset" google-chrome --kiosk --start-maximized --test-type --no-sandbox --disable-infobars --disable-gpu --disable-popup-blocking --window-size=$WIDTH,$HEIGHT --window-position=0,0 --no-first-run --ignore-certificate-errors --disable-dev-shm-usage --autoplay-policy=no-user-gesture-required --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' $DEBUG_CHROME_FLAGS $URL &> xvfb.log &
xvfb-run-safe --server-args="-ac -screen 0 ${RESOLUTION}x24 -noreset" google-chrome --kiosk --start-maximized --test-type --no-sandbox --disable-infobars --disable-gpu --disable-popup-blocking --window-size=$WIDTH,$HEIGHT --window-position=0,0 --no-first-run --ignore-certificate-errors --disable-dev-shm-usage --autoplay-policy=no-user-gesture-required --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' $DEBUG_CHROME_FLAGS $URL &> xvfb.log &
touch stop
chmod 777 /recordings

2
openvidu-server/docker/openvidu-recording/scripts/composed_quick_start.sh
View File

@ -33,7 +33,7 @@ if [[ -z "${COMPOSED_QUICK_START_ACTION}" ]]; then
touch xvfb.log
chmod 777 xvfb.log
xvfb-run --auto-servernum --server-args="-ac -screen 0 ${RESOLUTION}x24 -noreset" google-chrome --kiosk --start-maximized --test-type --no-sandbox --disable-infobars --disable-gpu --disable-popup-blocking --window-size=$WIDTH,$HEIGHT --window-position=0,0 --no-first-run --ignore-certificate-errors --disable-dev-shm-usage --autoplay-policy=no-user-gesture-required --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' $DEBUG_CHROME_FLAGS $URL &> xvfb.log &
xvfb-run-safe --server-args="-ac -screen 0 ${RESOLUTION}x24 -noreset" google-chrome --kiosk --start-maximized --test-type --no-sandbox --disable-infobars --disable-gpu --disable-popup-blocking --window-size=$WIDTH,$HEIGHT --window-position=0,0 --no-first-run --ignore-certificate-errors --disable-dev-shm-usage --autoplay-policy=no-user-gesture-required --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' $DEBUG_CHROME_FLAGS $URL &> xvfb.log &
chmod 777 /recordings
until pids=$(pidof Xvfb)

9
openvidu-server/docker/openvidu-recording/ubuntu-16-04.Dockerfile
View File

@ -26,9 +26,12 @@ RUN adduser root pulse-access
RUN apt-get autoclean
COPY entrypoint.sh scripts/composed.sh scripts/composed_quick_start.sh ./
RUN ["chmod", "+x", "/entrypoint.sh", "/composed.sh", "/composed_quick_start.sh"]
COPY utils/xvfb-run-safe /usr/local/bin
RUN mkdir /recordings
RUN chmod 777 /recordings
# Prepare scripts and folders
RUN chmod +x /entrypoint.sh /composed.sh /composed_quick_start.sh \
&& chmod +x /usr/local/bin/xvfb-run-safe \
&& mkdir /recordings \
&& chmod 777 /recordings
ENTRYPOINT /entrypoint.sh

11
openvidu-server/docker/openvidu-recording/ubuntu-20-04.Dockerfile
View File

@ -30,9 +30,12 @@ RUN adduser root pulse-access
RUN apt-get clean && apt-get autoclean && apt-get autoremove
COPY entrypoint.sh scripts/composed.sh scripts/composed_quick_start.sh ./
RUN ["chmod", "+x", "/entrypoint.sh", "/composed.sh", "/composed_quick_start.sh"]
COPY utils/xvfb-run-safe /usr/local/bin
RUN mkdir /recordings
RUN chmod 777 /recordings
# Prepare scripts and folders
RUN chmod +x /entrypoint.sh /composed.sh /composed_quick_start.sh \
&& chmod +x /usr/local/bin/xvfb-run-safe \
&& mkdir /recordings \
&& chmod 777 /recordings
ENTRYPOINT /entrypoint.sh
ENTRYPOINT /entrypoint.sh

22
openvidu-server/docker/openvidu-recording/utils/xvfb-run-safe Normal file
View File

@ -0,0 +1,22 @@
#!/bin/bash
# allow settings to be updated via environment
: "${xvfb_lockdir:=/recordings/.xvfb-locks}" # Lock folder necessary to block displays
: "${xvfb_display_min:=99}" # Min display
: "${xvfb_display_max:=599}" # Max display
mkdir -p -- "$xvfb_lockdir" || exit
i=$xvfb_display_min # minimum display number
while (( i < xvfb_display_max )); do
if [ -f "/tmp/.X$i-lock" ]; then
(( ++i )); continue
fi
exec 5>"$xvfb_lockdir/$i" || continue
if flock -x -n 5; then
exec xvfb-run --server-num="$i" "$@" || exit
fi
(( i++ ))
done