Merge remote-tracking branch 'origin'

This commit is contained in:
加里
2014-11-14 10:12:17 +08:00
3 changed files with 26 additions and 3 deletions

View File

@@ -345,7 +345,27 @@ function setRules(newRule){
}
userRule = util.merge(defaultRule,newRule);
'function' == typeof(userRule.summary) && console.log(userRule.summary());
var functions = [];
if('function' == typeof(userRule.init)){
functions.push(function(cb){
userRule.init(cb);
});
}
if('function' == typeof(userRule.summary)){
functions.push(function(cb){
userRule.summary();
cb(null);
});
}
async.series(functions,function(errors,result){
if(!errors){
console.log(color.green('Anyproxy initialize finished, have a fun!'));
}
});
//'function' == typeof(userRule.init) && console.log(userRule.init());
//'function' == typeof(userRule.summary) && console.log(userRule.summary());
}
}