added testing mode to server

This commit is contained in:
coderaiser 2012-07-06 07:55:15 -04:00
parent 40e4449a67
commit a3b0d10d81
3 changed files with 47 additions and 26 deletions

View file

@ -5,5 +5,6 @@
"css" : true,
"html" : true,
"img" : true
}
},
"server" : false
}

View file

@ -4,6 +4,20 @@
* серверной части Cloud Commander'а
*/
var CloudServer={
/* main Cloud Commander configuration
* readed from config.json if it's
* exist
*/
Config : {
"cache" : {"allowed" : true},
"minification" : {
"js" : false,
"css" : false,
"html" : true,
"img" : false
},
"server" : true
},
/* функция, которая генерирует заголовки
* файлов, отправляемые сервером клиенту
*/
@ -194,33 +208,28 @@ CloudServer.init=(function(){
console.log('server dir: ' + lServerDir);
process.chdir(lServerDir);
var lConfig={
"cache" : {"allowed" : true},
"minification" : {
"js" : false,
"css" : false,
"html" : true,
"img" : false
}
};
try{
console.log('reading configureation file config.json...');
lConfig=require('./config');
CloudServer.Config = require('./config');
console.log('config.json readed');
/* if command line parameter testing resolved
* setting config to testing
*/
if(process.argv[1]==='testing')CloudServer.Config.server=false;
}catch(pError){
console.log('warning: configureation file config.json not found...\n' +
'using default values...\n' +
JSON.stringify(lConfig));
}
JSON.stringify(CloudServer.Config));
}
/* Переменная в которой храниться кэш*/
CloudServer.Cache.setAllowed(lConfig.cache.allowed);
CloudServer.Cache.setAllowed(CloudServer.Config.cache.allowed);
/* Change default parameters of
* js/css/html minification
*/
CloudServer.Minify.setAllowed(lConfig.minification);
CloudServer.Minify.setAllowed(CloudServer.Config.minification);
/* Если нужно минимизируем скрипты */
CloudServer.Minify.doit();
CloudServer.Minify.doit();
});
@ -242,15 +251,25 @@ CloudServer.start=function()
CloudServer.IP = process.env.IP || /* c9 */
CloudServer.IP;
var http = require('http');
http.createServer(CloudServer._controller).listen(
CloudServer.Port,
CloudServer.IP);
console.log('Cloud Commander server running at http://' +
CloudServer.IP +
':' +
CloudServer.Port);
/* server mode or testing mode */
if(CloudServer.Config.server){
var http = require('http');
try{
http.createServer(CloudServer._controller).listen(
CloudServer.Port,
CloudServer.IP);
console.log('Cloud Commander server running at http://' +
CloudServer.IP +
':' +
CloudServer.Port);
}catch(pError){
console.log('Cloud Commander server could not started');
console.log(pError);
}
}else{
console.log('Cloud Commander testing mode');
}
/*
(!lC9Port?
(!lCloudFoundryPort?

View file

@ -5,4 +5,5 @@ jshint --config ./.jshintrc ./server.js ./client.js
echo "jshint ./lib/cloudfunc.js ./lib/server/minify.js ./lib/client/keyBinding.js"
jshint --config ./.jshintrc ./lib/cloudfunc.js ./lib/server/minify.js ./lib/client/keyBinding.js
echo "jshint ./package.json ./config.json"
jshint --config ./.jshintrc ./package.json ./config.json
jshint --config ./.jshintrc ./package.json ./config.json
node server.js testing