From af9cbbf7422ef3c41b7c39d1ae387c89e445b60c Mon Sep 17 00:00:00 2001 From: cruizba Date: Thu, 2 Jul 2020 10:32:07 +0200 Subject: [PATCH] Minor fix recording image debug mode --- openvidu-server/docker/openvidu-recording/create_image.sh | 3 +-- .../openvidu-recording/scripts/composed_quick_start.sh | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openvidu-server/docker/openvidu-recording/create_image.sh b/openvidu-server/docker/openvidu-recording/create_image.sh index f1836ab1..b6c353f4 100755 --- a/openvidu-server/docker/openvidu-recording/create_image.sh +++ b/openvidu-server/docker/openvidu-recording/create_image.sh @@ -4,5 +4,4 @@ OPENVIDU_RECORDING_CHROME_VERSION=$2 OPENVIDU_RECORDING_DOCKER_TAG=$3 docker build --rm --build-arg CHROME_VERSION="$OPENVIDU_RECORDING_CHROME_VERSION" \ -f $OPENVIDU_RECORDING_UBUNTU_VERSION.Dockerfile \ - -t openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG . \ - && docker push openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG + -t openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG . \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-recording/scripts/composed_quick_start.sh b/openvidu-server/docker/openvidu-recording/scripts/composed_quick_start.sh index 5ce3344c..15273a8d 100644 --- a/openvidu-server/docker/openvidu-recording/scripts/composed_quick_start.sh +++ b/openvidu-server/docker/openvidu-recording/scripts/composed_quick_start.sh @@ -62,7 +62,7 @@ if [[ -z "${COMPOSED_QUICK_START_ACTION}" ]]; then echo "export DISPLAY_NUM=$DISPLAY_NUM" > /tmp/display_num } 2>&1 | tee -a /tmp/container-start.log - + zzz sleep infinity elif [[ "${COMPOSED_QUICK_START_ACTION}" == "--start-recording" ]]; then @@ -168,7 +168,8 @@ elif [[ "${COMPOSED_QUICK_START_ACTION}" == "--stop-recording" ]]; then } 2>&1 | tee -a /tmp/container-stop-recording.log fi -if [[ ${DEBUG_MODE} == "true" ]]; then +if [[ ${DEBUG_MODE} == "true" && ! -z $VIDEO_ID ]]; then + export $(cat /tmp/display_num | xargs) [[ -f /tmp/container-start.log ]] && cp /tmp/container-start.log /recordings/$VIDEO_ID/$VIDEO_ID-container-start.log || echo "/tmp/container-start.log not found" [[ -f /tmp/container-start-recording.log ]] && cp /tmp/container-start-recording.log /recordings/$VIDEO_ID/$VIDEO_ID-container-start-recording.log || echo "/tmp/container-start-recording.log not found" [[ -f /tmp/container-stop-recording.log ]] && cp /tmp/container-stop-recording.log /recordings/$VIDEO_ID/$VIDEO_ID-container-stop-recording.log || echo "/tmp/container-stop-recording.log not found"