Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions electron_app/src/electron-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ electron.app.on('activate', () => {

electron.app.on('before-quit', () => {
global.appQuitting = true;
if (mainWindow) {
mainWindow.webContents.send('before-quit');
}
});

// Set the App User Model ID to match what the squirrel
Expand Down
6 changes: 6 additions & 0 deletions src/vector/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ rageshake.init().then(() => {
console.error("Failed to initialise rageshake: " + err);
});

window.addEventListener('beforeunload', (e) => {
console.log('riot-web closing');
// try to flush the logs to indexeddb
rageshake.flush();
});


// add React and ReactPerf to the global namespace, to make them easier to
// access via the console
Expand Down
7 changes: 7 additions & 0 deletions src/vector/platform/ElectronPlatform.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,16 @@ import dis from 'matrix-react-sdk/lib/dispatcher';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
import q from 'q';
import {remote, ipcRenderer} from 'electron';
import rageshake from '../rageshake';

remote.autoUpdater.on('update-downloaded', onUpdateDownloaded);

// try to flush the rageshake logs to indexeddb before quit.
ipcRenderer.on('before-quit', function () {
console.log('riot-desktop closing');
rageshake.flush();
});

function onUpdateDownloaded(ev: Event, releaseNotes: string, ver: string, date: Date, updateURL: string) {
dis.dispatch({
action: 'new_version',
Expand Down
7 changes: 7 additions & 0 deletions src/vector/rageshake.js
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,13 @@ module.exports = {
return initPromise;
},

flush: function() {
if (!store) {
return;
}
store.flush();
},

/**
* Clean up old logs.
* @return Promise Resolves if cleaned logs.
Expand Down