github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #565 from weaveworks/563-wss-websockets

Browse Source 
Support wss for secure websockets when page was loaded over ssl
This commit is contained in:
Paul Bellamy
2015-10-20 10:13:54 +01:00
parent 7408b1eb73 d7e26228bd
commit 659da5011e
3 changed files with 2550 additions and 2540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5083
app/static.go
View File

File diff suppressed because it is too large Load Diff

3
client/app/scripts/local.js
View File

@@ -2,6 +2,7 @@
// see main.js for the real entrypoint
// Inject websocket url to dev backend
window.WS_URL = 'ws://' + location.hostname + ':4040';
window.WS_PROTO = (location.protocol === 'https:' ? 'wss' : 'ws');
window.WS_URL = window.WS_PROTO + '://' + location.hostname + ':4040';
require('./main');

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

@@ -3,8 +3,8 @@ const reqwest = require('reqwest');
const AppActions = require('../actions/app-actions');
const WS_URL = window.WS_URL || 'ws://' + location.host + location.pathname.replace(/\/$/, '');
const WS_PROTO = window.WS_PROTO || (location.protocol === 'https:' ? 'wss' : 'ws');
const WS_URL = window.WS_URL || WS_PROTO + '://' + location.host + location.pathname.replace(/\/$/, '');
const apiTimerInterval = 10000;
const reconnectTimerInterval = 5000;