[#41] Pass SSH parameters to daemon

pull/42/head
Manuel de la Peña 2015-02-20 14:12:51 +01:00
parent 77bddbe17e
commit d45568a11d
2 changed files with 19 additions and 9 deletions

View File

@ -31,10 +31,20 @@ var sessionKey = 'sid';
var files = program.args.join(' ');
var filesNamespace = crypto.createHash('md5').update(files).digest('hex');
/**
* When connected send starting data
*/
var sshOptions = {
remoteHost: program.remoteHost,
remoteUser: program.remoteUser,
remotePort: program.remotePort
};
if (program.daemonize) {
daemonize(__filename, program, {
doAuthorization: doAuthorization,
doSecure: doSecure
doSecure: doSecure,
sshOptions: sshOptions
});
} else {
/**
@ -88,14 +98,6 @@ if (program.daemonize) {
highlightConfig = require(path.resolve(configPath));
}
/**
* When connected send starting data
*/
var sshOptions = {
remoteHost: program.remoteHost,
remoteUser: program.remoteUser,
remotePort: program.remotePort
};
var tailer = tail(program.args, {buffer: program.number, sshOptions:sshOptions});
var filesSocket = io.of('/' + filesNamespace).on('connection', function (socket) {
socket.emit('options:lines', program.lines);

View File

@ -35,6 +35,14 @@ module.exports = function (script, params, options) {
);
}
if (options.sshOptions) {
args.push(
'--remote-host', params.remoteHost,
'--remote-user', params.remoteUser,
'--remote-port', params.remotePort
);
}
if (params.uiHideTopbar) {
args.push('--ui-hide-topbar');
}