Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-20 18:18:56 +00:00
Code Issues Projects Releases Wiki Activity

changed sync reading of certs to async

Browse source
This commit is contained in:
coderaiser 2013-03-18 05:50:26 -04:00
parent 60f489f8a2
commit b5820350e9
5 changed files with 120 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

71
cloudcmd.js
View file

@ -28,7 +28,7 @@
/* reinit main dir os if we on
* Win32 should be backslashes */
DIR = main.DIR;
readConfig(init);
@ -181,14 +181,27 @@
route : route
};
if(Config.ssl)
lParams.ssl = {
ca : fs.readFileSync(DIR + 'ssl/sub.class1.server.ca.pem'),
key : fs.readFileSync(DIR + 'ssl/ssl.key'),
cert : fs.readFileSync(DIR + 'ssl/ssl.crt')
};
server.start(lParams);
if(Config.ssl){
var CA = DIR + 'ssl/sub.class1.server.ca.pem',
KEY = DIR + 'ssl/ssl.key',
CERT = DIR + 'ssl/ssl.crt';
readFiles([ CA, KEY, CERT ], function(pErrors, pFiles){
if(pErrors)
Util.log(pErrors);
else{
lParams.ssl = {
ca : pFiles[CA],
key : pFiles[KEY],
cert : pFiles[CERT]
};
server.start(lParams);
}
});
}
else
server.start(lParams);
}
else
Util.log('read error: config.json');
@ -308,6 +321,46 @@
}
}
function readFiles(pFiles, pCallBack){
var lDone = [],
lFiles,
lErrors,
lReadedFiles = {},
lDoneFunc = function (pParams){
var lRet = Util.checkObj(pParams, ['error', 'data', 'params']);
if(lRet){
lDone.pop();
var p = pParams,
lName = p.params;
if(p.error){
if(!lErrors) lErrors = {};
lErrors[lName] = p.error;
}
else
lReadedFiles[lName] = p.data;
if( !lDone.length )
Util.exec(pCallBack, lErrors, lReadedFiles);
}
};
if( Util.isArray(pFiles) )
lFiles = pFiles;
else
lFiles = [pFiles];
for(var i = 0, n = lFiles.length; i < n; i++){
var lName = lFiles.pop();
lDone.push(lName);
fs.readFile(lName, Util.call( lDoneFunc, lName ));
}
}
/* function sets stdout to file log.txt */
function writeLogsToFile(){