rule.summary

This commit is contained in:
想当当 2014-09-03 01:10:26 +08:00
parent 87f4f00ade
commit 16641116a0
2 changed files with 10 additions and 6 deletions

View File

@ -300,6 +300,7 @@ function setRules(newRule){
return; return;
}else{ }else{
userRule = util.merge(defaultRule,newRule); userRule = util.merge(defaultRule,newRule);
'function' == typeof(userRule.summary) && userRule.summary();
} }
} }

View File

@ -1,3 +1,9 @@
//mix some modules to global.util
try{
GLOBAL.util = {};
GLOBAL.util['iconv-lite'] = require("iconv-lite");
}catch(e){}
var http = require('http'), var http = require('http'),
https = require('https'), https = require('https'),
fs = require('fs'), fs = require('fs'),
@ -15,12 +21,6 @@ var http = require('http'),
GLOBAL.recorder = new Recorder(); GLOBAL.recorder = new Recorder();
//mix some modules to global.util
try{
GLOBAL.util = {};
GLOBAL.util['iconv-lite'] = require("iconv-lite");
}catch(e){}
var T_TYPE_HTTP = 0, var T_TYPE_HTTP = 0,
T_TYPE_HTTPS = 1, T_TYPE_HTTPS = 1,
DEFAULT_PORT = 8001, DEFAULT_PORT = 8001,
@ -54,6 +54,9 @@ function proxyServer(type, port, hostname,ruleFile){
}else{ }else{
console.log(color.red("can not find rule file")); console.log(color.red("can not find rule file"));
} }
}else{
rules = require("./lib/rule_default.js");
requestHandler.setRules(rules);
} }
async.series( async.series(