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

Merge pull request #6643 from capilkey/update-html5-adapterjs

Browse Source 
Update the version of adapterjs and renable sipjs logging
This commit is contained in:
Chad Pilkey 2019-01-25 16:53:23 -05:00 committed by GitHub
commit 31be9ebe30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4617 additions and 3881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8490
bigbluebutton-html5/client/compatibility/adapter.js Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

8
bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
View File

@ -14,6 +14,13 @@ const CALL_HANGUP_MAX_RETRIES = MEDIA.callHangupMaximumRetries;
const CONNECTION_TERMINATED_EVENTS = ['iceConnectionFailed', 'iceConnectionClosed'];
const CALL_CONNECT_NOTIFICATION_TIMEOUT = 500;
const logConnector = (level, category, label, content) => {
if (level === 'log')
level = "info";
logger[level]({logCode: 'sipjs_log'}, '[' + category + '] ' + content);
};
export default class SIPBridge extends BaseAudioBridge {
constructor(userData) {
super(userData);
@ -199,6 +206,7 @@ export default class SIPBridge extends BaseAudioBridge {
wsServers: `${(protocol === 'https:' ? 'wss://' : 'ws://')}${hostname}/ws`,
log: {
builtinEnabled: false,
connector: logConnector
},
displayName: callerIdName,
register: false,