invoke log util, console.log can be switched off

This commit is contained in:
OttoMao
2015-03-23 10:20:04 +08:00
parent bdf5e4fabb
commit 68478cd162
10 changed files with 122 additions and 85 deletions

View File

@@ -6,6 +6,7 @@ var exec = require('child_process').exec,
color = require('colorful'),
readline = require('readline'),
util = require('./util'),
logUtil = require("./log"),
asyncTask = require("async-task-mgr");
//TODO : unstable in windows
@@ -19,10 +20,10 @@ if(!fs.existsSync(certDir)){
try{
fs.mkdirSync(certDir,0777); //may fail in windows
}catch(e){
console.log("===========");
console.log("failed to create cert dir ,please create one by yourself - " + certDir);
console.log("this error will not block main thread unless you use https-related features in anyproxy");
console.log("===========");
logUtil.printLog("===========", logUtil.T_ERR);
logUtil.printLog("failed to create cert dir ,please create one by yourself - " + certDir, logUtil.T_ERR);
logUtil.printLog("this error will not block main thread unless you use https-related features in anyproxy", logUtil.T_ERR);
logUtil.printLog("===========", logUtil.T_ERR);
}
}
@@ -62,7 +63,7 @@ function createCert(hostname,callback){
callback && callback(new Error("error when generating certificate"),null);
}else{
var tipText = "certificate created for __HOST".replace(/__HOST/,hostname);
console.log(color.yellow(color.bold("[internal https]")) + color.yellow(tipText));
logUtil.printLog(color.yellow(color.bold("[internal https]")) + color.yellow(tipText)) ;
callback(null);
}
});
@@ -80,18 +81,19 @@ function isRootCAFileExists(){
}
function checkRootCA(){
if(!isRootCAFileExists()){
console.log(color.red("can not find rootCA.crt or rootCA.key"));
console.log(color.red("you may generate one by the following methods"));
console.log(color.red("\twhen using globally : anyproxy --root"));
console.log(color.red("\twhen using as a module : require(\"anyproxy\").generateRootCA();"));
if(!isRootCAFileExists() || true){
logUtil.printLog(color.red("can not find rootCA.crt or rootCA.key"), logUtil.T_ERR);
logUtil.printLog(color.red("you may generate one by the following methods"), logUtil.T_ERR);
logUtil.printLog(color.red("\twhen using globally : anyproxy --root"), logUtil.T_ERR);
logUtil.printLog(color.red("\twhen using as a module : require(\"anyproxy\").generateRootCA();"), logUtil.T_ERR);
logUtil.printLog(color.red("\tmore info : https://github.com/alibaba/anyproxy/wiki/How-to-config-https-proxy"), logUtil.T_ERR);
process.exit(0);
}
}
function generateRootCA(){
if(isRootCAFileExists()){
console.log(color.yellow("rootCA exists at " + certDir));
logUtil.printLog(color.yellow("rootCA exists at " + certDir));
var rl = readline.createInterface({
input : process.stdin,
output: process.stdout
@@ -101,7 +103,7 @@ function generateRootCA(){
if(/yes/i.test(answer)){
startGenerating();
}else{
console.log("will not generate a new one");
logUtil.printLog("will not generate a new one");
process.exit(0);
}
@@ -114,18 +116,18 @@ function generateRootCA(){
function startGenerating(){
//clear old certs
clearCerts(function(){
console.log(color.green("temp certs cleared"));
logUtil.printLog(color.green("temp certs cleared"));
var spawnSteam = spawn(cmd_genRoot,['.'],{cwd:certDir,stdio: 'inherit'});
spawnSteam.on('close', function (code) {
if(code == 0){
console.log(color.green("rootCA generated"));
console.log(color.green(color.bold("please trust the rootCA.crt in " + certDir)));
console.log(color.green(color.bold("or you may get it via anyproxy webinterface")));
process.exit(0);
logUtil.printLog(color.green("rootCA generated"));
logUtil.printLog(color.green(color.bold("please trust the rootCA.crt in " + certDir)));
logUtil.printLog(color.green(color.bold("or you may get it via anyproxy webinterface")));
}else{
console.log(color.red("fail to generate root CA"));
logUtil.printLog(color.red("fail to generate root CA"),logUtil.T_ERR);
}
process.exit(0);
});
});