Fixes for the rap scripts after processing a real recording

bigbluebutton-config/bin/bbb-record

@@ -78,8 +78,10 @@ mark_for_rebuild() {
 		rm -rf /var/bigbluebutton/deleted/$type/$MEETING_ID
 	done
 
-	# Restart processing at the 'sanity' step
-	redis-cli rpush resque:queue:rap:sanity "{\"class\":\"BigBlueButton::Resque::SanityWorker\",\"args\":[{\"meeting_id\":\"$MEETING_ID\"}]}"
+	# touch the file so rap-starter starts the process
+	touch $STATUS/recorded/$MEETING_ID.done
+	# In the future it could simply schedule a job on resque
+	# redis-cli rpush resque:queue:rap:sanity "{\"class\":\"BigBlueButton::Resque::SanityWorker\",\"args\":[{\"meeting_id\":\"$MEETING_ID\"}]}"
 }
 
 mark_for_republish() { 

record-and-playback/core/lib/recordandplayback.rb

@@ -249,6 +249,7 @@ module BigBlueButton
     props = BigBlueButton.read_props
     redis_host = props['redis_host']
     redis_port = props['redis_port']
-    BigBlueButton.redis_publisher = BigBlueButton::RedisWrapper.new(redis_host, redis_port)
+    redis_password = props['redis_password']
+    BigBlueButton.redis_publisher = BigBlueButton::RedisWrapper.new(redis_host, redis_port, redis_password)
   end
 end

record-and-playback/core/lib/recordandplayback/generators/events.rb

@@ -68,13 +68,13 @@ module BigBlueButton
     # Get the timestamp of the first event.
     def self.first_event_timestamp(events)
       first_event = events.at_xpath('/recording/event[position() = 1]')
-      first_event['timestamp'].to_i
+      first_event['timestamp'].to_i if first_event && first_event.key?('timestamp')
     end
     
     # Get the timestamp of the last event.
     def self.last_event_timestamp(events)
       last_event = events.at_xpath('/recording/event[position() = last()]')
-      last_event['timestamp'].to_i
+      last_event['timestamp'].to_i if last_event && last_event.key?('timestamp')
     end  
     
     # Determine if the start and stop event matched.

record-and-playback/core/scripts/post_publish/post_publish_recording_ready_callback.rb

@@ -32,6 +32,7 @@ BigBlueButton.logger = logger
 
 opts = Trollop::options do
   opt :meeting_id, "Meeting id to archive", :type => String
+  opt :format, "Playback format name", :type => String
 end
 meeting_id = opts[:meeting_id]
 

record-and-playback/core/scripts/workers/rap-publish-worker.rb

@@ -29,8 +29,8 @@ module BigBlueButton
         super do
           @logger.info("Running publish worker for #{@full_id}:#{@format_name}")
 
-          publish_script = File.expand_path("../../publish/#{@format_name}.rb", __FILE__)
-          if File.exist?(publish_script)
+          script = File.expand_path("../../publish/#{@format_name}.rb", __FILE__)
+          if File.exist?(script)
             @publisher.put_publish_started(@format_name, @meeting_id)
 
             # If the publish directory exists, the script does nothing

record-and-playback/core/scripts/workers/workers.rb

@@ -22,3 +22,4 @@ require File.expand_path('../rap-archive-worker.rb', __FILE__)
 require File.expand_path('../rap-sanity-worker.rb', __FILE__)
 require File.expand_path('../rap-process-worker.rb', __FILE__)
 require File.expand_path('../rap-publish-worker.rb', __FILE__)
+require File.expand_path('../rap-captions-worker.rb', __FILE__)

record-and-playback/core/systemd/bbb-rap-resque-worker.service

@@ -3,12 +3,12 @@ Description=BigBlueButton resque worker for recordings
 
 [Service]
 Type=simple
-ExecStart=/bin/sh -c '/usr/bin/rake -f ../Rakefile resque:work >> /var/log/bigbluebutton/bbb-rap-resque.log'
+ExecStart=/bin/sh -c '/usr/bin/rake -f ../Rakefile resque:workers >> /var/log/bigbluebutton/bbb-rap-worker.log'
 WorkingDirectory=/usr/local/bigbluebutton/core/scripts
 Environment=QUEUE=rap:archive,rap:publish,rap:process,rap:sanity,rap:captions
 Environment=COUNT=1
-#Environment=VVERBOSE=1
-User=tomcat7
+# Environment=VVERBOSE=1
+User=bigbluebutton
 Restart=always
 RestartSec=3