recording: small bug fixes, clean up, better logging

alangecker · Jul 27, 2020 · 158c4f7 · 158c4f7
1 parent ce0606d
commit 158c4f7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 124 deletions.
diff --git a/mod/core/Dockerfile b/mod/core/Dockerfile
@@ -55,8 +55,6 @@ COPY red5-webapps/screenshare/application.conf /usr/share/red5/webapps/screensha
 COPY red5-webapps/video/bigbluebutton-video.properties /usr/share/red5/webapps/video/WEB-INF/bigbluebutton-video.properties
 COPY red5-webapps/video-broadcast/video-broadcast.properties /usr/share/red5/webapps/video-broadcast/WEB-INF/video-broadcast.properties
 
-COPY bigbluebutton.yml /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml.tmpl
-
 COPY web/bigbluebutton.properties /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties.tmpl
 COPY web/turn-stun-servers.xml /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl
 
@@ -71,5 +69,9 @@ COPY entrypoint.sh /entrypoint.sh
 COPY prefix-log /usr/local/bin/prefix-log
 RUN mkdir -p /var/log/supervisor
 
+# add default presentation thumbnail
+RUN mkdir -p /usr/share/bigbluebutton/blank \
+ && wget -O /usr/share/bigbluebutton/blank/blank-thumb.png https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.2.20/bigbluebutton-config/slides/blank-thumb.png
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD []
diff --git a/mod/core/bbb-playback-presentation/presentation.yml b/mod/core/bbb-playback-presentation/presentation.yml
diff --git a/mod/core/bbb-playback-presentation/record-monitor.sh b/mod/core/bbb-playback-presentation/record-monitor.sh
diff --git a/mod/core/bigbluebutton.yml b/mod/core/bigbluebutton.yml
diff --git a/mod/core/entrypoint.sh b/mod/core/entrypoint.sh
@@ -22,14 +22,10 @@ mkdir -p /var/bigbluebutton/deleted
 mkdir -p /var/bigbluebutton/unpublished
 mkdir -p /var/bigbluebutton/playback
 
-# add playback-presentation to /var/bigbluebutton volume
-cp -r /usr/src/bbb-src-playback/* /var/bigbluebutton/playback
-
 # -- fix directory permissions
 chown -R bigbluebutton:bigbluebutton /var/bigbluebutton
 
 dockerize \
- -template /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml.tmpl:/usr/local/bigbluebutton/core/scripts/bigbluebutton.yml \
  -template /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties.tmpl:/usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties \
  -template /usr/share/bbb-apps-akka/conf/application.conf.tmpl:/usr/share/bbb-apps-akka/conf/application.conf \
  -template /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl:/usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml \

diff --git a/mod/recordings-process/entrypoint.sh b/mod/recordings-process/entrypoint.sh
@@ -6,6 +6,7 @@ python3 -u /log-collector.py &
 cd /usr/local/bigbluebutton/core/scripts
 
 while true; do
+ echo "execute workers..."
  bundle exec ruby rap-archive-worker.rb
  bundle exec ruby rap-sanity-worker.rb
  bundle exec ruby rap-process-worker.rb

diff --git a/scripts/bbb-record b/scripts/bbb-record
@@ -16,4 +16,5 @@ if [ ! "$ENABLE_RECORDING" == true ]; then
  exit 1
 fi
 
-./scripts/compose exec recordings-process bbb-record $@
+./scripts/compose exec recordings-process bbb-record $@
+./scripts/compose logs --tail=15 recordings-process