mirror of https://github.com/vector-im/riot-web
Fix missing js-sdk logging
Some of the js-sdk logging was going missing due to js-sdk's loglevel library being initialised before the rageshake logging. Fix by doing the rageshake setup within an import, as commented.pull/7736/head
parent
8298e73205
commit
092ae7ef2f
|
@ -24,6 +24,8 @@ require('gfm.css/gfm.css');
|
||||||
require('highlight.js/styles/github.css');
|
require('highlight.js/styles/github.css');
|
||||||
require('draft-js/dist/Draft.css');
|
require('draft-js/dist/Draft.css');
|
||||||
|
|
||||||
|
import './rageshakesetup';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
// add React and ReactPerf to the global namespace, to make them easier to
|
// add React and ReactPerf to the global namespace, to make them easier to
|
||||||
// access via the console
|
// access via the console
|
||||||
|
@ -56,8 +58,6 @@ import SdkConfig from "matrix-react-sdk/lib/SdkConfig";
|
||||||
|
|
||||||
import Olm from 'olm';
|
import Olm from 'olm';
|
||||||
|
|
||||||
import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";
|
|
||||||
|
|
||||||
import CallHandler from 'matrix-react-sdk/lib/CallHandler';
|
import CallHandler from 'matrix-react-sdk/lib/CallHandler';
|
||||||
|
|
||||||
import {getVectorConfig} from './getconfig';
|
import {getVectorConfig} from './getconfig';
|
||||||
|
@ -68,22 +68,6 @@ let lastLocationHashSet = null;
|
||||||
// and need to migrate, but they spam the console with warnings.
|
// and need to migrate, but they spam the console with warnings.
|
||||||
Promise.config({warnings: false});
|
Promise.config({warnings: false});
|
||||||
|
|
||||||
function initRageshake() {
|
|
||||||
rageshake.init().then(() => {
|
|
||||||
console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
|
|
||||||
|
|
||||||
window.addEventListener('beforeunload', (e) => {
|
|
||||||
console.log('riot-web closing');
|
|
||||||
// try to flush the logs to indexeddb
|
|
||||||
rageshake.flush();
|
|
||||||
});
|
|
||||||
|
|
||||||
rageshake.cleanup();
|
|
||||||
}, (err) => {
|
|
||||||
console.error("Failed to initialise rageshake: " + err);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkBrowserFeatures(featureList) {
|
function checkBrowserFeatures(featureList) {
|
||||||
if (!window.Modernizr) {
|
if (!window.Modernizr) {
|
||||||
console.error("Cannot check features - Modernizr global is missing.");
|
console.error("Cannot check features - Modernizr global is missing.");
|
||||||
|
@ -225,7 +209,6 @@ function onTokenLoginCompleted() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadApp() {
|
async function loadApp() {
|
||||||
initRageshake();
|
|
||||||
MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
|
MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
|
||||||
CallHandler.setConferenceHandler(VectorConferenceHandler);
|
CallHandler.setConferenceHandler(VectorConferenceHandler);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
Copyright 2018 New Vector Ltd
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Separate file that sets up rageshake logging when imported.
|
||||||
|
* This is necessary so that rageshake logging is set up before
|
||||||
|
* anything else. Webpack puts all import statements at the top
|
||||||
|
* of the file before any code, so imports will always be
|
||||||
|
* evaluated first. Other imports can cause other code to be
|
||||||
|
* evaluated (eg. the loglevel library in js-sdk, which if set
|
||||||
|
* up before rageshake causes some js-sdk logging to be missing
|
||||||
|
* from the rageshake.)
|
||||||
|
*/
|
||||||
|
|
||||||
|
import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";
|
||||||
|
|
||||||
|
function initRageshake() {
|
||||||
|
rageshake.init().then(() => {
|
||||||
|
console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
|
||||||
|
|
||||||
|
window.addEventListener('beforeunload', (e) => {
|
||||||
|
console.log('riot-web closing');
|
||||||
|
// try to flush the logs to indexeddb
|
||||||
|
rageshake.flush();
|
||||||
|
});
|
||||||
|
|
||||||
|
rageshake.cleanup();
|
||||||
|
}, (err) => {
|
||||||
|
console.error("Failed to initialise rageshake: " + err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
initRageshake();
|
Loading…
Reference in New Issue