BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into improve-rtmp-timeout-delay

Browse Source
This commit is contained in:
Richard Alam 2016-09-13 21:39:12 +00:00
commit c5a4e9a734
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-lti/lti.nginx
View File

@ -4,7 +4,7 @@
proxy_pass http://127.0.0.1:8080;
proxy_redirect default;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
proxy_set_header X-Forwarded-Proto $scheme;
# Allow 30M uploaded presentation document.
client_max_body_size 30m;

2
bigbluebutton-client/resources/config.xml.template
View File

@ -47,7 +47,7 @@
uri="rtmp://HOST/screenshare"
showButton="true"
baseTabIndex="201"
useWebRTCIfAvailable="false"
tryWebRTCFirst="false"
chromeExtensionKey=""
help="http://HOST/client/help/screenshare-help.html"
/>

2
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
View File

@ -150,7 +150,7 @@ package org.bigbluebutton.modules.screenshare.managers {
var option:ScreenshareOptions = new ScreenshareOptions();
option.parseOptions();
if (option.useWebRTCIfAvailable && !BrowserCheck.isWebRTCSupported()) {
if (option.tryWebRTCFirst && !BrowserCheck.isWebRTCSupported()) {
usingJava = true;
publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom());
sharing = true;

2
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
View File

@ -169,7 +169,7 @@ package org.bigbluebutton.modules.screenshare.managers
var options:ScreenshareOptions = new ScreenshareOptions();
options.parseOptions();
if (options.useWebRTCIfAvailable && BrowserCheck.isWebRTCSupported()) {
if (options.tryWebRTCFirst && BrowserCheck.isWebRTCSupported()) {
JSLog.warn("WebRTCDeskshareManager::handleStartSharingEvent WebRTC Supported", {});
if (BrowserCheck.isFirefox()) {
onSuccess("Firefox, lets try");

6
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
View File

@ -24,7 +24,7 @@ package org.bigbluebutton.modules.screenshare.model
{
[Bindable] public var showButton:Boolean = true;
[Bindable] public var baseTabIndex:int;
[Bindable] public var useWebRTCIfAvailable:Boolean = false;
[Bindable] public var tryWebRTCFirst:Boolean = false;
[Bindable] public var chromeExtensionKey:String = null;
[Bindable] public var helpUrl:String;
@ -40,8 +40,8 @@ package org.bigbluebutton.modules.screenshare.model
if (vxml.@showButton != undefined){
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
}
if (vxml.@useWebRTCIfAvailable != undefined) {
useWebRTCIfAvailable = (vxml.@useWebRTCIfAvailable.toString().toUpperCase() == "TRUE") ? true : false;
if (vxml.@tryWebRTCFirst != undefined) {
tryWebRTCFirst = (vxml.@tryWebRTCFirst.toString().toUpperCase() == "TRUE") ? true : false;
}
if (vxml.@chromeExtensionKey != undefined) {
chromeExtensionKey = vxml.@chromeExtensionKey.toString();

5
bigbluebutton-config/bin/bbb-record
View File

@ -602,8 +602,9 @@ fi
done
echo
echo "--"
ps fU $SERVLET_CONTAINER -o "%c%a" | grep -v COMMAND | grep -v logging.properties
systemctl --all --no-pager list-timers bbb-record-core.timer
echo "--"
systemctl --no-pager status bbb-record-core.service
echo "--"
if tail -n 20 /var/log/bigbluebutton/bbb-web.log | grep -q "is recorded. Process it."; then