projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 278 - Allow updating of NSD when there are instantiated network services
[osm/UI.git]
/
skyquake
/
framework
/
core
/
api_utils
/
sockets.js
diff --git
a/skyquake/framework/core/api_utils/sockets.js
b/skyquake/framework/core/api_utils/sockets.js
index
6076594
..
5e0b25b
100644
(file)
--- a/
skyquake/framework/core/api_utils/sockets.js
+++ b/
skyquake/framework/core/api_utils/sockets.js
@@
-32,17
+32,9
@@
var Promise = require('promise');
var url = require('url');
var sockjs = require('sockjs');
var websocket_multiplex = require('websocket-multiplex');
var url = require('url');
var sockjs = require('sockjs');
var websocket_multiplex = require('websocket-multiplex');
+var utils = require('./utils.js');
-function getPortForProtocol (protocol) {
- switch (protocol) {
- case 'http':
- return 8000;
- case 'https':
- return 8443;
- }
-}
-
var Subscriptions = function() {
this.ID = 0;
this.socketServers = {};
var Subscriptions = function() {
this.ID = 0;
this.socketServers = {};
@@
-85,7
+77,7
@@
Subscriptions.prototype.subscribe = function(req, callback) {
var origin = '';
if (req.query['api_server']) {
var api_server_protocol = req.query['api_server'].match(protocolTest)[1];
var origin = '';
if (req.query['api_server']) {
var api_server_protocol = req.query['api_server'].match(protocolTest)[1];
- var api_server_origin = req.query['api_server'] + ':' + getPortForProtocol(api_server_protocol);
+ var api_server_origin = req.query['api_server'] + ':' +
utils.
getPortForProtocol(api_server_protocol);
origin = api_server_origin;
protocol = api_server_protocol;
} else {
origin = api_server_origin;
protocol = api_server_protocol;
} else {