From 9b17dab2e6ae157858739d819fd618168316cc4e Mon Sep 17 00:00:00 2001
From: Marcel Hellkamp <marc@gsites.de>
Date: Wed, 12 Aug 2020 11:07:19 +0200
Subject: [PATCH] Fix: Presentation publishing fails when run on NFS storage
PR #9857 was incomplete and did not completely fix the issues described in #9062 and #9110 (dublicate).
---
.../presentation/scripts/publish/presentation.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/record-and-playback/presentation/scripts/publish/presentation.rb b/record-and-playback/presentation/scripts/publish/presentation.rb
index c828ddb3f7..ad3c138f9d 100755
--- a/record-and-playback/presentation/scripts/publish/presentation.rb
+++ b/record-and-playback/presentation/scripts/publish/presentation.rb
@@ -31,7 +31,7 @@ require 'fastimage' # require fastimage to get the image size of the slides (gem
# This script lives in scripts/archive/steps while properties.yaml lives in scripts/
bbb_props = YAML::load(File.open('../../core/scripts/bigbluebutton.yml'))
-$presentation_props = YAML::load(File.open('presentation.yml'))
+$presentation_props = YAML::load(File.read('presentation.yml'))
# There's a couple of places where stuff is mysteriously divided or multiplied
# by 2. This is just here to call out how spooky that is.
@@ -926,7 +926,7 @@ def processPresentation(package_dir)
# Iterate through the events.xml and store the events, building the
# xml files as we go
last_timestamp = 0.0
- events_xml = Nokogiri::XML(File.open("#{$process_dir}/events.xml"))
+ events_xml = Nokogiri::XML(File.read("#{$process_dir}/events.xml"))
events_xml.xpath('/recording/event').each do |event|
eventname = event['eventname']
last_timestamp = timestamp =
@@ -1269,7 +1269,7 @@ begin
processing_time = File.read("#{$process_dir}/processing_time")
- @doc = Nokogiri::XML(File.open("#{$process_dir}/events.xml"))
+ @doc = Nokogiri::XML(File.read("#{$process_dir}/events.xml"))
# Retrieve record events and calculate total recording duration.
$rec_events = BigBlueButton::Events.match_start_and_stop_rec_events(
@@ -1300,7 +1300,7 @@ begin
# Update state and add playback to metadata.xml
## Load metadata.xml
- metadata = Nokogiri::XML(File.open("#{package_dir}/metadata.xml"))
+ metadata = Nokogiri::XML(File.read("#{package_dir}/metadata.xml"))
## Update state
recording = metadata.root
state = recording.at_xpath("state")
--
GitLab