haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref: Moves xmpp logs to be accessed from connection. (#7517) 

* ref: Moves xmpp logs to be accessed from connection.

In cases where there is no room like pre-join and lobby screen we still want to be able to debug xmpp messages.

* squash: Updates lib-jitsi-meet.
This commit is contained in:
Дамян Минков 2020-08-13 13:12:56 -05:00 committed by GitHub
parent cdd782a82f
commit 4ca4e242b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conference.js
View File

@ -759,7 +759,13 @@ export default {
} }
if (isPrejoinPageEnabled(APP.store.getState())) { if (isPrejoinPageEnabled(APP.store.getState())) {
_connectionPromise = connect(roomName); _connectionPromise = connect(roomName).then(c => {
// we want to initialize it early, in case of errors to be able
// to gather logs
APP.connection = c;
return c;
});
const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(initialOptions); const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(initialOptions);
const tracks = await tryCreateLocalTracks; const tracks = await tryCreateLocalTracks;
@ -1206,10 +1212,6 @@ export default {
// end used by torture // end used by torture
getLogs() {
return room.getLogs();
},
/** /**
* Download logs, a function that can be called from console while * Download logs, a function that can be called from console while
* debugging. * debugging.
@ -1218,7 +1220,7 @@ export default {
saveLogs(filename = 'meetlog.json') { saveLogs(filename = 'meetlog.json') {
// this can be called from console and will not have reference to this // this can be called from console and will not have reference to this
// that's why we reference the global var // that's why we reference the global var
const logs = APP.conference.getLogs(); const logs = APP.connection.getLogs();
const data = encodeURIComponent(JSON.stringify(logs, null, ' ')); const data = encodeURIComponent(JSON.stringify(logs, null, ' '));
const elem = document.createElement('a'); const elem = document.createElement('a');

4
package-lock.json generated
View File

@ -17945,8 +17945,8 @@
} }
}, },
"lib-jitsi-meet": { "lib-jitsi-meet": {
"version": "github:jitsi/lib-jitsi-meet#372020a71d91eb4911cd3fb76164f2ffa0cd8b2f", "version": "github:jitsi/lib-jitsi-meet#3ac82faa2d6a0e09428b89409b1c89cce08904bf",
"from": "github:jitsi/lib-jitsi-meet#372020a71d91eb4911cd3fb76164f2ffa0cd8b2f", "from": "github:jitsi/lib-jitsi-meet#3ac82faa2d6a0e09428b89409b1c89cce08904bf",
"requires": { "requires": {
"@jitsi/js-utils": "1.0.0", "@jitsi/js-utils": "1.0.0",
"@jitsi/sdp-interop": "1.0.3", "@jitsi/sdp-interop": "1.0.3",

2
package.json
View File

@ -56,7 +56,7 @@
"jquery-i18next": "1.2.1", "jquery-i18next": "1.2.1",
"js-md5": "0.6.1", "js-md5": "0.6.1",
"jwt-decode": "2.2.0", "jwt-decode": "2.2.0",
"lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#372020a71d91eb4911cd3fb76164f2ffa0cd8b2f", "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#3ac82faa2d6a0e09428b89409b1c89cce08904bf",
"libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d", "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
"lodash": "4.17.19", "lodash": "4.17.19",
"moment": "2.19.4", "moment": "2.19.4",