From 1a88830a27a8cdaa3efe5803686ff61127d46e38 Mon Sep 17 00:00:00 2001
From: Calvin Walton <calvin.walton@kepstin.ca>
Date: Tue, 21 Jan 2020 17:21:50 -0500
Subject: [PATCH] RaP: Fix done filenames for segmented recordings
The done filenames all have to contain the break_timestamp to identify
the segment
---
.../core/lib/recordandplayback/workers/archive_worker.rb | 6 +++---
.../core/lib/recordandplayback/workers/process_worker.rb | 4 ++--
.../core/lib/recordandplayback/workers/publish_worker.rb | 4 ++--
.../core/lib/recordandplayback/workers/sanity_worker.rb | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/record-and-playback/core/lib/recordandplayback/workers/archive_worker.rb b/record-and-playback/core/lib/recordandplayback/workers/archive_worker.rb
index b40c4c42a2..ae28f3f422 100644
--- a/record-and-playback/core/lib/recordandplayback/workers/archive_worker.rb
+++ b/record-and-playback/core/lib/recordandplayback/workers/archive_worker.rb
@@ -65,9 +65,9 @@ module BigBlueButton
def initialize(opts)
super(opts)
@step_name = 'archive'
- @archived_fail = "#{@recording_dir}/status/archived/#{@meeting_id}.fail"
- @archived_done = "#{@recording_dir}/status/archived/#{@meeting_id}.done"
- @archived_norecord = "#{@recording_dir}/status/archived/#{@meeting_id}.norecord"
+ @archived_fail = "#{@recording_dir}/status/archived/#{@full_id}.fail"
+ @archived_done = "#{@recording_dir}/status/archived/#{@full_id}.done"
+ @archived_norecord = "#{@recording_dir}/status/archived/#{@full_id}.norecord"
end
end
end
diff --git a/record-and-playback/core/lib/recordandplayback/workers/process_worker.rb b/record-and-playback/core/lib/recordandplayback/workers/process_worker.rb
index 3de92593ee..b49294ac5a 100644
--- a/record-and-playback/core/lib/recordandplayback/workers/process_worker.rb
+++ b/record-and-playback/core/lib/recordandplayback/workers/process_worker.rb
@@ -80,8 +80,8 @@ module BigBlueButton
@step_name = 'process'
@format_name = opts['format_name']
@post_scripts_path = File.expand_path('../post_process', __dir__)
- @processed_done = "#{@recording_dir}/status/processed/#{@meeting_id}-#{@format_name}.done"
- @processed_fail = "#{@recording_dir}/status/processed/#{@meeting_id}-#{@format_name}.fail"
+ @processed_done = "#{@recording_dir}/status/processed/#{@full_id}-#{@format_name}.done"
+ @processed_fail = "#{@recording_dir}/status/processed/#{@full_id}-#{@format_name}.fail"
end
end
end
diff --git a/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb b/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb
index d45f9b2f8f..5aaf512fcc 100644
--- a/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb
+++ b/record-and-playback/core/lib/recordandplayback/workers/publish_worker.rb
@@ -118,8 +118,8 @@ module BigBlueButton
@step_name = 'publish'
@format_name = opts['format_name']
@post_scripts_path = File.expand_path('../post_publish', __dir__)
- @published_done = "#{@recording_dir}/status/published/#{@meeting_id}-#{@format_name}.done"
- @published_fail = "#{@recording_dir}/status/published/#{@meeting_id}-#{@format_name}.fail"
+ @published_done = "#{@recording_dir}/status/published/#{@full_id}-#{@format_name}.done"
+ @published_fail = "#{@recording_dir}/status/published/#{@full_id}-#{@format_name}.fail"
end
end
end
diff --git a/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb b/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb
index b24d2f18d1..dd2efa2027 100644
--- a/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb
+++ b/record-and-playback/core/lib/recordandplayback/workers/sanity_worker.rb
@@ -60,8 +60,8 @@ module BigBlueButton
super(opts)
@step_name = 'sanity'
@post_scripts_path = File.expand_path('../post_archive', __dir__)
- @sanity_fail = "#{@recording_dir}/status/sanity/#{@meeting_id}.fail"
- @sanity_done = "#{@recording_dir}/status/sanity/#{@meeting_id}.done"
+ @sanity_fail = "#{@recording_dir}/status/sanity/#{@full_id}.fail"
+ @sanity_done = "#{@recording_dir}/status/sanity/#{@full_id}.done"
end
end
end
--
GitLab