From 14ccb90b1035f6ff159efb8108534449f170e51e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 10 Feb 2014 04:18:45 -0500 Subject: [PATCH] refactor(server) start --- lib/server.js | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/server.js b/lib/server.js index ccbe65e8..9049e8a5 100644 --- a/lib/server.js +++ b/lib/server.js @@ -52,7 +52,8 @@ * @param pProcessing {index, appcache, rest} */ function start(options) { - var config = main.config; + var redirectServer, + config = main.config; if (!options) options = {}; @@ -99,41 +100,42 @@ expressApp = express.getApp(controller); Server = http.createServer(expressApp || controller); - Server.on('error', Util.log); + Server.on('error', Util.log.bind(Util)); Server.listen(lPort, lIP); lServerLog(lHTTP, lPort); lSockets(Server); }, - lServerLog = function(pHTTP, pPort) { - Util.log('* Server running at ' + pHTTP + lIP + ':' + pPort); + lServerLog = function(http, port) { + Util.log('* Server running at ' + http + lIP + ':' + port); }; /* server mode or testing mode */ - if (config.server) { + if (config.server) if (lSSL) { Util.log('* Redirection http -> https is setted up'); lServerLog(lHTTP, lPort); - var lRedirectServer = http.createServer( function(pReq, pRes) { - var lURL, - lHost = pReq.headers.host, - lParsed = URL.parse(lHost), - lHostName = lParsed.protocol; + + redirectServer = http.createServer(function(req, res) { + var url, + host = req.headers.host, + parsed = url.parse(lHost), + hostName = parsed.protocol; - lURL = lHTTPS + lHostName + lSSLPort + pReq.url; + url = lHTTPS + hostName + lSSLPort + req.url; main.redirect({ - response: pRes, - url: lURL + response: res, + url: url }); }); - lRedirectServer.listen(lPort, lIP); + redirectServer.listen(lPort, lIP); Server = https.createServer(lSSL, controller); - Server.on('error', function (pError) { + Server.on('error', function (error) { Util.log('Could not use https port: ' + lSSLPort); - Util.log(pError); - lRedirectServer.close(); + Util.log(error); + redirectServer.close(); Util.log('* Redirection http -> https removed'); lHTTPServer(); }); @@ -144,7 +146,7 @@ lServerLog(lHTTPS, lSSLPort); } else lHTTPServer(); - } else + else Util.log('Cloud Commander testing mode'); }