github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added logic to turn off network requests when Scope dismounts

Browse Source
This commit is contained in:
jpellizzari
2017-02-28 22:12:38 -08:00
parent 4f24d9bba8
commit d775020794
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/app/scripts/utils/router-utils.js
View File

@@ -90,21 +90,20 @@ export function updateRoute(getState) {
export function getRouter(dispatch, initialState) {
let mergedState = initialState;
// strip any trailing '/'s.
page.base(window.location.pathname.replace(/\/$/, ''));
const storageState = storageGet(STORAGE_STATE_KEY);
if (storageState) {
window.location.hash = `!/state/${storageState}`;
const parsedState = JSON.parse(decodeURL(storageState));
mergedState = Object.assign(initialState, parsedState);
}
page('/', () => {
// recover from storage state on empty URL
const storageState = storageGet(STORAGE_STATE_KEY);
if (storageState) {
// push storage state to URL
window.location.hash = `!/state/${storageState}`;
const parsedState = JSON.parse(decodeURL(storageState));
const mergedState = Object.assign(initialState, parsedState);
dispatch(route(mergedState));
} else {
dispatch(route(initialState));
}
dispatch(route(mergedState));
});
page('/state/:state', (ctx) => {

27
client/app/scripts/utils/web-api-utils.js
View File

@@ -142,7 +142,10 @@ function createWebsocket(topologyUrl, optionsQuery, dispatch) {
* Any opts that get passed in will override the defaults.
*/
function doRequest(opts) {
const config = defaults(opts, { contentType: 'application/json' });
const config = defaults(opts, {
contentType: 'application/json',
type: 'json'
});
if (csrfToken) {
config.headers = Object.assign({}, config.headers, { 'X-CSRF-Token': csrfToken });
}
@@ -193,9 +196,10 @@ export function getTopologies(options, dispatch) {
export function getNodesDelta(topologyUrl, options, dispatch, forceReload) {
const optionsQuery = buildOptionsQuery(options);
// only recreate websocket if url changed or if forced (weave cloud instance reload);
const isNewUrl = topologyUrl && (topologyUrl !== currentUrl || currentOptions !== optionsQuery);
// Only recreate websocket if url changed or if forced (weave cloud instance reload);
// Check for truthy options and that options have changed.
const isNewOptions = currentOptions && currentOptions !== optionsQuery;
const isNewUrl = topologyUrl && (topologyUrl !== currentUrl || isNewOptions);
if (forceReload || isNewUrl) {
createWebsocket(topologyUrl, optionsQuery, dispatch);
currentUrl = topologyUrl;
@@ -348,3 +352,18 @@ export function getPipeStatus(pipeId, dispatch) {
}
});
}
export function stopTopologyPolling() {
clearTimeout(topologyTimer);
topologyTimer = 0;
}
export function teardownWebsockets() {
clearTimeout(reconnectTimer);
if (socket) {
socket.onerror = null;
socket.onclose = null;
socket.close();
currentOptions = null;
}
}