Merge remote-tracking branch 'upstream/v2.0.x-release' into sft

bigbluebutton-config/bin/bbb-conf

@@ -290,7 +290,7 @@ stop_bigbluebutton () {
     echo "Stopping BigBlueButton"
     if command -v systemctl >/dev/null; then
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
-          HTML5="mongod bbb-html5 bbb-webrtc-sfu kurento-media-server-6.0"
+          HTML5="mongod bbb-html5 bbb-webrtc-sfu kurento-media-server"
        fi
        if [ -f /usr/lib/systemd/system/bbb-webhooks.service ]; then
           WEBHOOKS=bbb-webhooks
@@ -346,7 +346,7 @@ start_bigbluebutton () {
     echo "Starting BigBlueButton"
     if command -v systemctl >/dev/null; then
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
-          HTML5="mongod bbb-html5 bbb-webrtc-sfu kurento-media-server-6.0"
+          HTML5="mongod bbb-html5 bbb-webrtc-sfu kurento-media-server"
        fi
        if [ -f /usr/lib/systemd/system/bbb-webhooks.service ]; then
           WEBHOOKS=bbb-webhooks
@@ -486,7 +486,7 @@ display_bigbluebutton_status () {
 	units="red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka bbb-transcode-akka bbb-fsesl-akka"
 
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
-          units="$units mongod bbb-html5 bbb-webrtc-sfu kurento-media-server-6.0"
+          units="$units mongod bbb-html5 bbb-webrtc-sfu kurento-media-server"
        fi
 
 	for unit in $units; do
@@ -1476,6 +1476,13 @@ check_state() {
                 echo "#"
         fi
 
+        if bbb-conf --status | grep -q inactive; then
+                echo "# Error: Detected some processes have not started correctly"
+                echo "#"
+                echo "#   $(bbb-conf --status | grep inactive)"
+                echo "#"
+        fi
+
 	exit 0
 }
 

bigbluebutton-html5/imports/ui/components/video-provider/component.jsx

@@ -266,17 +266,6 @@ class VideoProvider extends Component {
       options.remoteVideo = tag;
     }
 
-    this.cameraTimeouts[id] = setTimeout(() => {
-      log('error', `Camera share has not suceeded in ${CAMERA_SHARE_FAILED_WAIT_TIME}`);
-      if (this.props.userId == id) {
-        this.notifyError(intl.formatMessage(intlMessages.sharingError));
-        this.unshareWebcam();
-      } else {
-        this.stop(id);
-        this.initWebRTC(id, shareWebcam, videoOptions, tag);
-      }
-    }, CAMERA_SHARE_FAILED_WAIT_TIME);
-
     const webRtcPeer = new peerObj(options, function (error) {
       if (error) {
         log('error', ' WebRTC peerObj create error');
@@ -290,9 +279,9 @@ class VideoProvider extends Component {
         that.destroyWebRTCPeer(id);
 
         if (shareWebcam) {
+          that.unshareWebcam();
           VideoService.exitVideo();
           VideoService.exitedVideo();
-          that.unshareWebcam();
         }
         return log('error', error);
       }
@@ -313,6 +302,18 @@ class VideoProvider extends Component {
           return log('error', error);
         }
 
+        that.cameraTimeouts[id] = setTimeout(() => {
+          log('error', `Camera share has not suceeded in ${CAMERA_SHARE_FAILED_WAIT_TIME}`);
+          if (that.props.userId == id) {
+            that.notifyError(intl.formatMessage(intlMessages.sharingError));
+            that.unshareWebcam();
+            VideoService.exitedVideo();
+          } else {
+            that.stop(id);
+            that.initWebRTC(id, shareWebcam, videoOptions, tag);
+          }
+        }, CAMERA_SHARE_FAILED_WAIT_TIME);
+
         console.log(`Invoking SDP offer callback function ${location.host}`);
         const message = {
           type: 'video',
@@ -396,6 +397,7 @@ class VideoProvider extends Component {
 
     if (message.cameraId == userId) {
       this.unshareWebcam();
+      VideoService.exitedVideo();
       this.notifyError(intl.formatMessage(intlMessages.sharingError));
     } else {
       this.stop(message.cameraId);

bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx

@@ -54,6 +54,7 @@ const JoinVideoOptions = ({
     >
       <DropdownTrigger tabIndex={0}>
         <Button
+          className={styles.button}
           label={intl.formatMessage(intlMessages.videoMenu)}
           onClick={() => null}
           hideLabel

bigbluebutton-html5/imports/ui/components/video-provider/video-menu/styles.scss

@@ -1,19 +1,13 @@
 @import "/imports/ui/stylesheets/variables/_all";
 
-.container {
-
-  span:first-child{
-    box-shadow: 0 2px 5px 0 rgb(0, 0, 0);
-  }
-
-}
-
 .button {
-
   &:focus {
     outline: none !important;
   }
 
+  span:first-child {
+    box-shadow: 0 2px 5px 0 rgb(0, 0, 0);
+  }
 }
 
 .imageSize {

labs/bbb-webrtc-sfu/config/default.example.yml

@@ -17,5 +17,5 @@ to-audio: "to-audio-sfu"
 to-akka: "to-akka-apps-redis-channel"
 
 log:
-    filename: '/var/log/bigbluebutton/bbb-webrtc-sfu/bbb-webrtc-sfu.log'
+    filename: '/var/log/bbb-webrtc-sfu/bbb-webrtc-sfu.log'
     level: 'verbose'