diff --git a/lib/proxyManager.js b/lib/proxyManager.js index 18c6937..7ddeacb 100644 --- a/lib/proxyManager.js +++ b/lib/proxyManager.js @@ -76,11 +76,11 @@ unixLikeSysProxyManager.disableGlobalProxy = function() { var result = execSync( // disable http proxy - 'networksetup -setwebproxystate ${networkType} off; ' + 'sudo networksetup -setwebproxystate ${networkType} off; ' .replace(/\$\{networkType\}/g, networkType) + // disable https proxy - 'networksetup -setsecurewebproxystate ${networkType} off' + 'sudo networksetup -setsecurewebproxystate ${networkType} off' .replace(/\$\{networkType\}/g, networkType)); return result; diff --git a/proxy.js b/proxy.js index 1634625..89896e5 100644 --- a/proxy.js +++ b/proxy.js @@ -165,10 +165,16 @@ function proxyServer(option){ var result = require('./lib/proxyManager').enableGlobalProxy(ip.address(), proxyPort); if (result.status) { - console.log(color.red(result.stdout)); + callback(result.stdout); + } else { + callback(null); } + + } else { + callback(null); } + }, //server status manager @@ -185,6 +191,11 @@ function proxyServer(option){ process.exit(); }); + //exit cause ctrl+c + process.on("SIGINT", function() { + process.exit(); + }); + process.on("uncaughtException",function(err){ logUtil.printLog('Caught exception: ' + (err.stack || err), logUtil.T_ERR); process.exit();