diff --git a/lib/server/main.js b/lib/server/main.js index 7fcad27f..f3ae13fb 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -48,7 +48,6 @@ exports.SRVDIR = SRVDIR = __dirname + SLASH, exports.LIBDIR = LIBDIR = path.normalize(SRVDIR + '../'), exports.DIR = DIR = path.normalize(LIBDIR + '../'), - exports.VOLUMES = getVolumes(), /* Functions */ exports.generateHeaders = generateHeaders, @@ -71,7 +70,6 @@ exports.config = rootrequire('config'); exports.mainpackage = rootrequire('package'); - /* Additional Modules */ /* * Any of loaded below modules could work with global var so @@ -81,6 +79,9 @@ */ global.cloudcmd.main = exports; + exports.VOLUMES = getVolumes(), + + /* Additional Modules */ exports.auth = srvrequire('auth').auth, exports.appcache = srvrequire('appcache'), exports.cache = srvrequire('cache').Cache, @@ -100,7 +101,7 @@ * @param {Strin} pSrc */ function mrequire(pSrc){ - var lModule, + var lModule, lError = Util.tryCatchLog(function(){ lModule = require(pSrc); }); @@ -212,12 +213,13 @@ */ function getVolumes(){ var lRet = ISWIN32 ? [] : '/'; - + if(ISWIN32) srvrequire('win').getVolumes(function(pVolumes){ + console.log(pVolumes); exports.VOLUMES = pVolumes; }); - + return lRet; } })();