root
/
telebit.js
mirror of https://git.coolaj86.com/coolaj86/telebit.js.git
2
2
Fork 0
Code Issues Releases Wiki Activity

chimney

This commit is contained in:
AJ ONeal 2018-09-03 23:18:59 -06:00
parent 918eeb49d7
commit d39ebf88a2
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/telebitd.js
View File

@ -646,7 +646,6 @@ function serveControlsHelper() {
}); });
if (fs.existsSync(state._ipc.path)) { if (fs.existsSync(state._ipc.path)) {
console.log("DEBUG ipc path unlink");
fs.unlinkSync(state._ipc.path); fs.unlinkSync(state._ipc.path);
} }
// mask is so that processes owned by other users // mask is so that processes owned by other users
@ -658,18 +657,15 @@ function serveControlsHelper() {
, exclusive: false , exclusive: false
}; };
if ('socket' === state._ipc.type) { if ('socket' === state._ipc.type) {
console.log("DEBUG ipc path make");
require('mkdirp').sync(path.dirname(state._ipc.path)); require('mkdirp').sync(path.dirname(state._ipc.path));
} }
// https://nodejs.org/api/net.html#net_server_listen_options_callback // https://nodejs.org/api/net.html#net_server_listen_options_callback
// path is ignore if port is defined // path is ignore if port is defined
// https://git.coolaj86.com/coolaj86/telebit.js/issues/23#issuecomment-326 // https://git.coolaj86.com/coolaj86/telebit.js/issues/23#issuecomment-326
if (state._ipc.port) { if (state._ipc.port) {
console.log("DEBUG ipc localhost");
serverOpts.host = 'localhost'; serverOpts.host = 'localhost';
serverOpts.port = state._ipc.port; serverOpts.port = state._ipc.port;
} else { } else {
console.log("DEBUG ipc socket path");
serverOpts.path = state._ipc.path; serverOpts.path = state._ipc.path;
} }
controlServer.listen(serverOpts, function () { controlServer.listen(serverOpts, function () {
@ -698,7 +694,6 @@ function serveControls() {
console.info("[info] connecting with stored token"); console.info("[info] connecting with stored token");
startTelebitRemote(function (err/*, _tun*/) { startTelebitRemote(function (err/*, _tun*/) {
console.log("DEBUG going to serve controls soon...");
if (err) { throw err; } if (err) { throw err; }
//if (_tun) { myRemote = _tun; } //if (_tun) { myRemote = _tun; }
setTimeout(function () { setTimeout(function () {
@ -958,7 +953,6 @@ state.net = state.net || {
} }
}; };
console.log('DEBUG parse config');
fs.readFile(confpath, 'utf8', parseConfig); fs.readFile(confpath, 'utf8', parseConfig);
}()); }());