From aced55b58b5a044f1a026ccc7a9b5a5763c95c8b Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 24 Feb 2014 10:43:19 -0500 Subject: [PATCH] refactor(server) start --- lib/server.js | 112 +++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/lib/server.js b/lib/server.js index 2bec69bb..a3bb1ce6 100644 --- a/lib/server.js +++ b/lib/server.js @@ -52,74 +52,74 @@ * @param pProcessing {index, appcache, rest} */ function start(options) { - var redirectServer, + var redirectServer, port, ip, isSSL, sslPort, + sockets, httpServer, serverLog, + HTTP = 'http://', + HTTPS = 'https://', config = main.config; if (!options) options = {}; - Rest = options.rest; - Route = options.route; + Rest = options.rest; + Route = options.route; init(options.appcache); - var lPort = process.env.PORT || /* c9 */ - process.env.app_port || /* nodester */ - process.env.VCAP_APP_PORT || /* cloudfoundry */ - config.port, + port = process.env.PORT || /* c9 */ + process.env.app_port || /* nodester */ + process.env.VCAP_APP_PORT || /* cloudfoundry */ + config.port, + ip = process.env.IP || /* c9 */ + config.ip || + (main.WIN32 ? '127.0.0.1' : '0.0.0.0'), + + isSSL = options.ssl, + sslPort = config.sslPort, + + sockets = function(pServer) { + var listen, msg, + status = 'off'; - lIP = process.env.IP || /* c9 */ - config.ip || - (main.WIN32 ? '127.0.0.1' : '0.0.0.0'), - - lSSL = options.ssl, - lSSLPort = config.sslPort, - lHTTP = 'http://', - lHTTPS = 'https://', - - lSockets = function(pServer) { - var listen, msg, - status = 'off'; + if (config.socket && Socket) { + listen = Socket.listen(pServer); - if (config.socket && Socket) { - listen = Socket.listen(pServer); - - if (listen) { - status = 'on'; - Console.init(); - Terminal.init(); - } + if (listen) { + status = 'on'; + Console.init(); + Terminal.init(); } - - msg = CloudFunc.formatMsg('sockets', '', status); - - Util.log(msg); - }, + } - lHTTPServer = function() { - expressApp = express.getApp([ - Rest, - Route, - join, - controller - ]); - - Server = http.createServer(expressApp || respond); - - Server.on('error', Util.log.bind(Util)); - Server.listen(lPort, lIP); - lServerLog(lHTTP, lPort); - lSockets(Server); - }, + msg = CloudFunc.formatMsg('sockets', '', status); - lServerLog = function(http, port) { - Util.log('* Server running at ' + http + lIP + ':' + port); - }; + Util.log(msg); + }, + + httpServer = function() { + expressApp = express.getApp([ + Rest, + Route, + join, + controller + ]); + + Server = http.createServer(expressApp || respond); + + Server.on('error', Util.log.bind(Util)); + Server.listen(port, ip); + serverLog(HTTP, port); + sockets(Server); + }, + + serverLog = function(http, port) { + Util.log('* Server running at ' + http + ip + ':' + port); + }; /* server mode or testing mode */ if (config.server) - if (lSSL) { + if (isSSL) { Util.log('* Redirection http -> https is setted up'); - lServerLog(lHTTP, lPort); + serverLog(http, port); redirectServer = http.createServer(function(req, res) { var url, @@ -127,7 +127,7 @@ parsed = url.parse(host), hostName = parsed.protocol; - url = lHTTPS + hostName + lSSLPort + req.url; + url = HTTPS + hostName + sslPort + req.url; main.redirect({ response: res, @@ -146,12 +146,12 @@ lHTTPServer(); }); - lSockets(Server); + sockets(Server); Server.listen(lSSLPort, lIP); - lServerLog(lHTTPS, lSSLPort); + serverLog(lHTTPS, lSSLPort); } else - lHTTPServer(); + httpServer(); else Util.log('Cloud Commander testing mode'); }