From 1fcaf80b00b0a763d777f4444f9bcf91332a9e9b Mon Sep 17 00:00:00 2001 From: Mathew Henson Date: Thu, 23 Jun 2016 10:37:13 +0100 Subject: [PATCH] Added info statements to clarify if the socket created was secure or not --- src/controllers/comms-controller.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/controllers/comms-controller.ts b/src/controllers/comms-controller.ts index d062868..08d67ad 100644 --- a/src/controllers/comms-controller.ts +++ b/src/controllers/comms-controller.ts @@ -148,6 +148,7 @@ export class CommsController extends events.EventEmitter // Create the web socket server if (cfg.ssl) { + winston.info("Creating secure socket connection", { process: process.pid }); var httpsServer: https.Server = null; var caChain = [fs.readFileSync(cfg.sslIntermediate), fs.readFileSync(cfg.sslRoot)]; var privkey = cfg.sslKey ? fs.readFileSync(cfg.sslKey) : null; @@ -159,7 +160,11 @@ export class CommsController extends events.EventEmitter this._server = new ws.Server({ server: httpsServer }); } else - this._server = new ws.Server({ port: cfg.websocket.port }); + { + winston.info("Creating regular socket connection", { process: process.pid }); + this._server = new ws.Server({ port: cfg.websocket.port }); + } + winston.info("Websockets attempting to listen on HTTP port " + cfg.websocket.port, { process: process.pid }); @@ -189,7 +194,7 @@ export class CommsController extends events.EventEmitter if (!clientApproved) { - winston.error(`A connection was made by ${headers.host || headers.origin} but it is not on the approved domain list. Make sure the host is on the approvedSocketDomains parameter in the config file.`); + winston.error(`A connection was made by ${headers.origin} but it is not on the approved domain list. Make sure the host is on the approvedSocketDomains parameter in the config file.`); ws.terminate(); ws.close(); }