From 70881c6ac5cef686c3a7251da868d1a351014221 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 23 Jul 2014 05:42:47 -0400 Subject: [PATCH] refactor(server) main -> require --- lib/server.js | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/lib/server.js b/lib/server.js index eea9552a..348f2a25 100644 --- a/lib/server.js +++ b/lib/server.js @@ -8,25 +8,28 @@ '# Module is part of Cloud Commander,' + '\n' + '# easy to use web server.' + '\n' + '# http://cloudcmd.io' + '\n'); - + console.log(__dirname); var main = global.cloudcmd.main, - DIR = main.DIR, - URL = main.url, - Path = main.path, + DIR = './', + DIR_SERVER = DIR + 'server/', - Minify = main.minify, - CloudFunc = main.cloudfunc, - AppCache = main.appcache, - Socket = main.socket, - Console = main.console, - Terminal = main.terminal, - join = main.srvrequire('join'), + URL = require('url'), + Path = require('path'), + http = require('http'), + https = require('https'), + + Util = require(DIR + 'util'), + CloudFunc = require(DIR + 'cloudfunc'), + + Minify = require(DIR_SERVER + 'minify'), + AppCache = require(DIR_SERVER + 'appcache'), + Socket = require(DIR_SERVER + 'socket'), + Console = require(DIR_SERVER + 'console'), + Terminal = require(DIR_SERVER + 'terminal'), + join = require(DIR_SERVER + 'join'), + express = require(DIR_SERVER + 'express'), - http = main.http, - https = main.https, - Util = main.util, - express = main.express, expressApp, emptyHandler = function(req, res, next) { Util.exec(next); },