Browse Source

code styling

pull/89/head
BradfordMedeiros 8 years ago
parent
commit
822c4d3f7b
  1. 38
      src/getSSLSettings.js
  2. 1
      src/index.js

38
src/getSSLSettings.js

@ -1,6 +1,18 @@
const optimist = require('optimist'); const optimist = require('optimist');
const path = require('path'); const path = require('path');
const getDefaultSSLArgs = () => {
return ({
runhttps: false,
sshport: 22,
sshhost: 'localhost',
sshauth: 'password',
globalsshuser: '',
port: undefined,
ssl: undefined,
});
};
const getOptions = () => { const getOptions = () => {
return ( return (
optimist optimist
@ -38,29 +50,6 @@ const getOptions = () => {
); );
}; };
const getSSLObject = opts => {
if (opts.sslkey && opts.sslcert){
return ({
key: opts.sslkey,
cert: opts.sslcert,
});
}
return undefined;
};
const getDefaultSSLArgs = () => {
return ({
runhttps: false,
sshport: 22,
sshhost: 'localhost',
sshauth: 'password',
globalsshuser: '',
port: undefined,
ssl: undefined,
});
};
const getSSLArgsFromCommandLine = () => { const getSSLArgsFromCommandLine = () => {
const defaultArgs = getDefaultSSLArgs(); const defaultArgs = getDefaultSSLArgs();
const opts = getOptions(); const opts = getOptions();
@ -72,12 +61,11 @@ const getSSLArgsFromCommandLine = () => {
sshauth: opts.sshauth ? opts.sshauth : defaultArgs.sshauth, sshauth: opts.sshauth ? opts.sshauth : defaultArgs.sshauth,
globalsshuser: opts.sshuser? opts.sshuser: defaultArgs.globalsshuser, globalsshuser: opts.sshuser? opts.sshuser: defaultArgs.globalsshuser,
port: opts.port ? opts.port: defaultArgs.port, port: opts.port ? opts.port: defaultArgs.port,
ssl: getSSLObject(opts), ssl: (opts.sslkey && opts.sslcert) ? { key: opts.sslkey, cert: opts.sslcert} : undefined,
}; };
return args; return args;
}; };
module.exports = { module.exports = {
getSSLArgsFromCommandLine, getSSLArgsFromCommandLine,
getDefaultSSLArgs, getDefaultSSLArgs,

1
src/index.js

@ -3,7 +3,6 @@ const startServer = require('./startServer');
const getSSLArgsFromCommandLine = require('./getSSLSettings.js').getSSLArgsFromCommandLine; const getSSLArgsFromCommandLine = require('./getSSLSettings.js').getSSLArgsFromCommandLine;
const getDefaultSSLArgs = require('./getSSLSettings').getDefaultSSLArgs; const getDefaultSSLArgs = require('./getSSLSettings').getDefaultSSLArgs;
const runApp = () => { const runApp = () => {
process.on('uncaughtException', function(e) { process.on('uncaughtException', function(e) {
console.error('Wetty Error: ' + e); console.error('Wetty Error: ' + e);

Loading…
Cancel
Save