BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,174 Commits 13 Branches 260 Tags 1.1 GiB
fe6993d699
Commit Graph

293 Commits

Author SHA1 Message Date
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Anton Georgiev
6b8626d40f cleaning up and reverting unnecessary config 2015-09-29 16:03:40 +00:00
Anton Georgiev
366b01fff7 webrtc deskshare work on recording scripts 2015-09-25 18:05:54 +00:00
RafaFP
0284ee0048 Latest version of the implementation of the feature #1734. 
Data on Playback, Metadata and Download are now present on the publish_ended event.
If the related content is absent it will be returned empty, if otherwise present all child tags and data will be presented.

 refs 1734
 2015-09-14 15:55:06 +00:00
RafaFP
4325e98bf2 Implemented the code to add the "playback", "meta" and "download" tags from the XML to the publish_ended. 
Added code to guarantee that a hash is passed even when the tags do not exist in the XML.

 #feature 1734
 2015-09-11 21:12:09 +00:00
RafaFP
2a85811d40 Implemented hash data gathering dinamically, still have to use TRY to catch the nil exception. 
If the hash is nil the publish_ended post is skipped.

Must validate the tag values and add the download tag.
 2015-09-11 18:20:47 +00:00
Felipe Cecagno
ed366e6b21 Merge branch '090-recordings-size' into mconf-live0.7.3 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
 2015-09-08 17:43:20 -03:00
Felipe Cecagno
32957898f6 refactored part of the bbb-0.9-recording-size code in order to include the size on the download size for mconf_encrypted and the playback size for the others; included raw_size for all available formats 2015-09-08 17:18:02 -03:00
RafaFP
eb1b5aee49 Included playback data to the event of "publish_ended" 
#refs 1734
 2015-09-01 16:13:10 +00:00
RafaFP
8602d3c263 Added the link and duration info to the publish_ended event. 
#refs 1734
 2015-08-31 20:29:00 +00:00
Fred Dixon
c99da48041 Removed uneeded script 2015-08-13 17:32:03 -04:00
Felipe Cecagno
eef0398885 changing permissions over bbb-0.9-recording-size, which is now executable 2015-07-15 17:16:04 -03:00
Pedro Beschorner Marin
60a1ae6436 Cleanup 2015-06-10 17:14:14 +00:00
Pedro Beschorner Marin
cbfe8b8859 Added an update script for sizes injection in old recordings metadata and some refactoring 2015-06-10 17:07:11 +00:00
Felipe Cecagno
7cb12f8b49 Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 
Conflicts:
	bbb-api-demo/src/main/webapp/demo10_helper.jsp
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/cy_GB/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_419/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/hy_AM/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ms_MY/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-05-17 19:25:26 -03:00
Calvin Walton
e1e2d78e50 Skip the 'ser' repair if there are no webcam videos 
This was causing the sanity check to fail.
 2015-03-24 21:15:49 -03:00
Calvin Walton
34b13eb807 Attempt to repair red5 'ser' files in sanity script 2015-03-24 21:15:49 -03:00
Calvin Walton
5a2c7bae69 Fix beta recording update script 
It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.

The name of the '.done' file is changed so the update will be re-run
automatically.
 2015-03-20 17:48:05 -03:00
Calvin Walton
e75bb15ad0 Fix beta recording update script 
It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.

The name of the '.done' file is changed so the update will be re-run
automatically.
 2015-03-18 14:56:00 -04:00
Calvin Walton
eedbafa94f Adjust recording system to archive, but not process, recordings with no marks 
This allows them to be preserved for a period of time, rather than be
deleted immediately. Useful for recovering recordings when someone forgot
to press the record button during the session.
 2015-03-11 13:40:56 -04:00
Felipe Cecagno
ad25125b19 reverted back the previous implementation of presentation_export as process/publish scripts instead of just one publish script; now rap-worker cleans the workspace when the presentation format is published, so presentation dependet formats can execute in the next run 2015-02-02 14:06:20 -02:00
Felipe Cecagno
d1bcfe9189 do not run the publish script if the process script failed 2015-02-02 13:59:29 -02:00
Felipe Cecagno
1de10b2339 protect rap-worker to write the processing_time file when the directory isn't there yet 2015-02-02 13:58:57 -02:00
Calvin Walton
c90e5f8990 Skip the 'ser' repair if there are no webcam videos 
This was causing the sanity check to fail.
 2015-01-30 10:11:44 -05:00
Calvin Walton
c6f976db4b Attempt to repair red5 'ser' files in sanity script 2015-01-27 14:01:29 -05:00
Felipe Cecagno
f077cc1f98 do not generate a .fail file during the archive phase if no recording marks were detected 2014-11-26 15:37:19 -02:00
Felipe Cecagno
6b863595b2 removing the keys during the archive phase if there's no recording marks in the recording 2014-11-26 12:06:15 -02:00
Calvin Walton
213dc07c19 Merge pull request #428 from mconf/rap-publish-events 
Rap publish events
 2014-11-14 12:08:44 -02:00
Felipe Cecagno
1c143c74a1 refactored rap-worker so variable names make more sense than before 2014-11-13 23:10:22 -02:00
Felipe Cecagno
0cefee5534 now the rap scripts publish to redis pubsub (channel bigbluebutton:from-rap) when a rap phase begins and ends - it includes archive, sanity, post_archive, process, post_process, publish and post_publish; if there's more than one workflow, it should work without any modification 2014-11-12 17:28:33 -02:00
Fred Dixon
9cdc47d16d Merge pull request #426 from kepstin/recording-updates-2 
Load bigbluebutton.yml from current path
 2014-11-12 16:30:34 -02:00
Calvin Walton
30fdd13af8 Load bigbluebutton.yml from current path 2014-11-12 16:25:52 -02:00
Fred Dixon
48b9c5a01d Merge pull request #403 from kepstin/recording-updates-2 
Version the playback files for the presentation recording format
 2014-11-12 16:02:13 -02:00
Calvin Walton
98efa28316 Add a script to handle updating links in existing recordings 
This adds the version number to the playback links so that
recordings select the correct version-specific playback support
files.

This script may be run automatically during upgrade; in that
case it should be run like

.../bbb-0.9-beta-recording-update --quiet

After copying recordings from an old BigBlueButton server, you
may want to manually re-run the script, and it takes the option
--force to recheck all recordings even if it has previously been
run.
 2014-11-12 15:54:45 -02:00
Calvin Walton
961898c1e9 Add delay before recording archiving to workaround Red5 race 
Right now there is a possibility that the rap-worker process might
see the recording.done file (written by bbb-web) prior to Red5 having
completed writing the video files to disk.

This happens most often when a meeting end api request is sent while a
webcam is visible.

Add a delay (currently 2 minutes) before the archive scripts are run
to work around the issue. Real fix is far more complicated...
 2014-11-12 11:13:57 -02:00
Calvin Walton
49b66d6eb6 Fix publish step failing when multiple recordings processed in one run 
The logic for deleting the process done files was wrong, resulting in
the script (attempting and failing) deleting all of the done files for
all of the processed recordings after the publish completes for one of
them.

Fix the logic to only delete the process done file for the recording that
just completed publishing.
 2014-10-08 11:08:22 -04:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Calvin Walton
8f7bf010fd Switch "post" scripts to be a drop-in directory. 2014-08-11 14:57:32 -04:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Calvin Walton
c73fe81e50 rap-worker: Add /usr/local/bin to the path. 2014-07-28 11:02:38 -04:00
Calvin Walton
86e8394e70 rap-worker: Ensure status directories are created 
In some cases, it was attempting to create a status file in a directory
that did not exist yet.
 2014-07-23 09:50:52 -04:00
Calvin Walton
11045c7f4a rap-worker: Set log level to 'INFO' 
I had it on DEBUG temporarily for testing. The old version used ERROR,
but this made it print virtually no output which made diagnosing
issues difficult.
 2014-07-21 15:00:29 -04:00
Calvin Walton
b91a54afa0 record core: Remove hardcoded ffmpeg path 
The ffmpeg binary should be looked up using the normal PATH mechanism,
it might not always be installed in the same place.
 2014-07-21 14:59:33 -04:00
Calvin Walton
efb44c9dd9 Rewrite rap-worker script in an optimized fashion 
It now does much less directory reading, and performance should
scale far better with large numbers of recordings.

Semantics should be mostly unchanged, but there's greater use
of '.fail' files to mark errors, and '.done' files are now removed
after all of the following processing steps complete.

The rap worker no longer relies on processing scripts leaving
behind empty directories; those are now removed where appropriate.
 2014-07-21 14:58:46 -04:00
Gustavo Salazar
67422a4450 set version in archive 2014-05-06 17:15:10 -05:00
Gustavo Salazar
ab648a5f73 pass only meeting id to post publish script 2014-05-05 18:27:26 -05:00
Gustavo Salazar
efda95fed6 delete temp files 2014-04-29 10:33:23 -05:00
Gustavo Salazar
b1e82fe58d post scripts for record and playback 2014-04-24 19:08:06 -05:00
Gustavo Salazar
4989b195f4 set absolute path to ffmpeg 2014-04-07 12:14:47 -07:00
Richard Alam
460dfb52bf - modify scripts so we can run it manually 2014-04-03 20:23:49 +00:00
Fred Dixon
332824a42c Fixes so rap-worker.rb executes 2014-03-26 23:52:59 +00:00
Gustavo Salazar
99866d43a7 Print audio file name with problems. 2014-01-30 10:45:43 -05:00
Felipe Cecagno
955f9edc99 fixing the issue of the whiteboard annotations not being shown in the proper slide; cleaning the environment (events.xml, recorded flag) when the session was recorded but the record button wasn't used 2013-12-02 13:57:05 -02:00
Felipe Cecagno
d8b3375f48 we don't want to archive recordings in which there's no mark to start the recording; it would be the same as if the meeting would be created with record=false - the only difference is that the events are archived to recordings/raw/meeting_id/events.xml, and the recorded .done flag is created as well 2013-10-02 14:18:26 -03:00
Guilherme Augusto Dias
1122f7d298 Fix playback host address 
Fix playback host address on configuration files
 2013-07-29 16:28:04 +00:00
Gustavo Salazar
bed598ca7a remove events and files for webcam streams with length zero 2013-07-15 15:22:39 -05:00
Felipe Cecagno
ced61d3fba rap-worker now keeps track of the processing time of a recording; a file called processing_time is generated during the process phase, and this information is added to metadata.xml when the recording is published - this information isn't retrieved by getRecordings because no modification was done on bbb-web to include this information, but at least it's there so the sysadmin can check how long does a recording take to get processed 2013-06-13 17:13:20 -03:00
Gustavo Salazar
2ae224765e a log file by meeting in archive phase 2013-04-29 16:03:21 -05:00
Gustavo Salazar
7fe05d349f sanity check for webcam and deskshare 2013-04-04 15:08:49 -05:00
gustavo salazar
6d90e31b85 Set playback_host in bigbluebutton.yml 2012-09-10 16:12:10 -05:00
Gustavo Salazar
f5ee8b6cbf Update license. 2012-09-04 16:42:13 -05:00
Markos Calderon
0c9e45682e added failed status 2012-08-21 16:55:41 -05:00
Markos Calderon
d75ca5dca4 finish testing of sanity check 2012-08-20 18:12:58 -05:00
Markos Calderon
9d9bf10e81 pending changes in rap-worker 2012-08-15 19:10:29 -05:00
Markos Calderon
7fb265e756 adding sanity check 2012-08-13 15:22:53 -05:00
Richard Alam
7b1ff2d4bb - add utf-8 encoding magic comment to recording ruby scripts 
http://blog.grayproductions.net/articles/understanding_m17n
 2012-05-03 18:56:01 +00:00
Markos Calderon
77f664c6bd checking dirs instead of done files 2011-12-07 13:18:21 -08:00
Markos Calderon
c95a8bc56a adding a checking in rap-worker 2011-12-06 12:22:35 -08:00
Fred Dixon
a3849c9a52 Removed old comments from rap-worker.rb 2011-11-20 11:16:11 -08:00
Fred Dixon
ccc87f0831 Temporarily disabled messages 'Skipping ... ' from record and playback scripts as they generate large log files 2011-09-27 08:49:06 -07:00
Marco Calderon
28ad4f6ce8 Cleanup script 2011-08-16 08:17:21 +00:00
gugat
59031812be Add logger in rap-worker.rb 2011-07-20 20:13:22 -05:00
gugat
21eed7e1d4 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-11 14:26:47 -05:00
Fred Dixon
c431169bd7 Changed redis host for bigbluebutton.yml to 127.0.0.1 2011-07-10 08:38:12 -07:00
gugat
12bdbf8475 Add logi to check redis port an host 2011-07-04 20:01:41 -05:00
gugat
428dbe84f2 Create script with logic we need to add for record and playback 
Based in bbb-conf create functions to check errors in record and playback log files
 2011-06-30 21:17:01 -05:00
gugat
b247c749a8 Add log info to BigBlueButton.execute : exitstatus, succeed? , exited? 
Change IO.popen to  BigBlueButton.execute in /core/scripts/rap-worker.rb (2)
 2011-06-29 17:39:25 -05:00
Richard Alam
d044221d70 - start implementing get recording api 2011-06-22 15:53:27 -04:00
Richard Alam
1af29981fd - move the rap core god conf into default god/conf 2011-06-08 21:14:52 -04:00
Richard Alam
f2c603c1a5 - create god scripts to manage record-and-processing script 2011-06-07 14:54:38 -04:00
Richard Alam
350d71b53e - setup logger properly 2011-06-06 16:09:53 -04:00
Richard Alam
f2b6b07112 - no need to "sudo -u tomcat6" as main script already runs as tomcat6 2011-06-06 14:58:16 -04:00
Richard Alam
9609de20a9 - run as tomcat6 user 2011-06-06 14:45:25 -04:00
Richard Alam
870acbf50e - start automating archive, ingest, publish 2011-06-06 14:42:38 -04:00
Richard Alam
87a53dce50 - archive only new recordings 2011-06-06 13:38:16 -04:00
Richard Alam
6b6b5bea1f - look into recorded .done file to see if the meeting needs to be archived 2011-06-03 12:17:51 -04:00
Richard Alam
1bb6e20291 - renamed ingenst-and-processing script 
- log when saving metadata
 2011-06-03 11:15:24 -04:00
Richard Alam
705f849a64 - make script dir part of core instead of separate bin dir for easier triggering of build/packaging of bbb-record-core package 2011-05-22 17:10:22 -04:00
Richard Alam
aa1708c1c2 - change paths to locate bigbluebutton.yml and the core/lib directory 2011-05-22 16:41:44 -04:00
Richard Alam
60a03364ee move this around to separate simple, matterhorn, and core rec-and-playback for packaging 2011-05-22 16:21:29 -04:00
Richard Alam
6bca8db210 - rename rap to core record and playback 2011-05-22 16:02:46 -04:00