Skip to content
Snippets Groups Projects
Commit b7a73680 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

[enh] `start` + `stop` + `restart` modularized

parent 39247ce5
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
app/cli.js
+ 10
− 279
View file @ b7a73680
"use strict";
const co = require('co');
const logger = require('../app/lib/logger')('cli');
const Q = require('q');
const _ = require('underscore');
const Command = require('commander').Command;
const contacter = require('../app/lib/contacter');
const directory = require('../app/lib/system/directory');
const wizard = require('../app/lib/wizard');
const multicaster = require('../app/lib/streams/multicaster');
const pjson = require('../package.json');
const duniter = require('../index');
const constants = require('../app/lib/constants');
module.exports = () => {
......@@ -25,11 +17,17 @@ module.exports = () => {
addCommand: (command, executionCallback) => commands.push({ command, executionCallback }),
// To execute the provided command
execute: (programArgs, onServiceCallback) => co(function*() {
execute: (programArgs) => co(function*() {
const program = new Command();
let onResolve, onReject = () => Promise.reject(Error("Uninitilized rejection throw")), onService, closeCommand = () => Promise.resolve(true);
// Callback for command success
let onResolve;
// Callback for command rejection
let onReject = () => Promise.reject(Error("Uninitilized rejection throw"));
// Command execution promise
const currentCommand = new Promise((resolve, reject) => {
onResolve = resolve;
onReject = reject;
......@@ -96,290 +94,23 @@ module.exports = () => {
});
}
program
.command('start')
.description('Start Duniter node daemon.')
.action(subCommand(service((server, conf) => new Promise((resolve, reject) => {
co(function*() {
try {
const bma = require('./lib/streams/bma');
logger.info(">> NODE STARTING");
// Public http interface
let bmapi = yield bma(server, null, conf.httplogs);
// Routing documents
server.routing();
// Services
yield server.startServices();
yield bmapi.openConnections();
logger.info('>> Server ready!');
} catch (e) {
reject(e);
}
});
}))));
program
.command('stop')
.description('Stop Duniter node daemon.')
.action(subCommand(needsToBeLaunchedByScript));
program
.command('restart')
.description('Restart Duniter node daemon.')
.action(subCommand(needsToBeLaunchedByScript));
program
.on('*', function (cmd) {
console.log("Unknown command '%s'. Try --help for a listing of commands & options.", cmd);
onResolve();
});
function subCommand(promiseFunc) {
return function() {
let args = Array.prototype.slice.call(arguments, 0);
return co(function*() {
try {
let result = yield promiseFunc.apply(null, args);
onResolve(result);
} catch (e) {
if (e && e.uerr) {
onReject(e.uerr.message);
} else {
onReject(e);
}
}
})
};
}
function service(callback, nologs) {
return function () {
if (nologs) {
// Disable logs
require('../app/lib/logger')().mute();
}
const cbArgs = arguments;
const dbName = program.mdb;
const dbHome = program.home;
// Add log files for this instance
logger.addHomeLogs(directory.getHome(dbName, dbHome));
const home = directory.getHome(dbName, dbHome);
const theServer = duniter(home, program.memory === true, commandLineConf(program));
// If ever the process gets interrupted
let isSaving = false;
closeCommand = () => co(function*() {
if (!isSaving) {
isSaving = true;
// Save DB
return theServer.disconnect();
}
});
const that = this;
// Initialize server (db connection, ...)
return co(function*() {
try {
yield theServer.initWithDAL();
yield configure(program, theServer, theServer.conf || {});
yield theServer.loadConf();
cbArgs.length--;
cbArgs[cbArgs.length++] = theServer;
cbArgs[cbArgs.length++] = theServer.conf;
cbArgs[cbArgs.length++] = program;
onService && onService(theServer);
return callback.apply(that, cbArgs);
} catch (e) {
theServer.disconnect();
throw e;
}
});
};
}
onService = onServiceCallback;
program.parse(programArgs);
if (programArgs.length <= 2) {
onReject('No command given.');
}
const res = yield currentCommand;
if (closeCommand) {
yield closeCommand();
}
return res;
return currentCommand;
})
};
};
/****************
*
* UTILITIES
*
****************/
function commandLineConf(program, conf) {
conf = conf || {};
conf.sync = conf.sync || {};
const cli = {
currency: program.currency,
cpu: program.cpu,
server: {
port: program.port,
ipv4address: program.ipv4,
ipv6address: program.ipv6,
remote: {
host: program.remoteh,
ipv4: program.remote4,
ipv6: program.remote6,
port: program.remotep
}
},
db: {
mport: program.mport,
mdb: program.mdb,
home: program.home
},
net: {
upnp: program.upnp,
noupnp: program.noupnp
},
logs: {
http: program.httplogs,
nohttp: program.nohttplogs
},
endpoints: [],
rmEndpoints: [],
isolate: program.isolate,
forksize: program.forksize,
nofork: program.nofork,
timeout: program.timeout
};
// Update conf
if (cli.currency) conf.currency = cli.currency;
if (cli.server.ipv4address) conf.ipv4 = cli.server.ipv4address;
if (cli.server.ipv6address) conf.ipv6 = cli.server.ipv6address;
if (cli.server.port) conf.port = cli.server.port;
if (cli.server.remote.host != undefined) conf.remotehost = cli.server.remote.host;
if (cli.server.remote.ipv4 != undefined) conf.remoteipv4 = cli.server.remote.ipv4;
if (cli.server.remote.ipv6 != undefined) conf.remoteipv6 = cli.server.remote.ipv6;
if (cli.server.remote.port != undefined) conf.remoteport = cli.server.remote.port;
if (cli.net.upnp) conf.upnp = true;
if (cli.net.noupnp) conf.upnp = false;
if (cli.cpu) conf.cpu = Math.max(0.01, Math.min(1.0, cli.cpu));
if (cli.logs.http) conf.httplogs = true;
if (cli.logs.nohttp) conf.httplogs = false;
if (cli.db.mport) conf.mport = cli.db.mport;
if (cli.db.home) conf.home = cli.db.home;
if (cli.db.mdb) conf.mdb = cli.db.mdb;
if (cli.isolate) conf.isolate = cli.isolate;
if (cli.timeout) conf.timeout = cli.timeout;
if (cli.forksize != null) conf.forksize = cli.forksize;
// Specific internal settings
conf.createNext = true;
return _(conf).extend({routing: true});
}
/**
* Super basic server with only its home path set
* @param program
* @param callback
* @returns {Function}
*/
function getServer(program, callback) {
return function () {
var cbArgs = arguments;
var dbName = program.mdb || "duniter_default";
var dbHome = program.home;
const home = directory.getHome(dbName, dbHome);
var server = duniter(home, program.memory === true, commandLineConf(program));
cbArgs.length--;
cbArgs[cbArgs.length++] = server;
cbArgs[cbArgs.length++] = server.conf;
return callback.apply(this, cbArgs);
};
}
function parsePercent(s) {
var f = parseFloat(s);
const f = parseFloat(s);
return isNaN(f) ? 0 : f;
}
function needsToBeLaunchedByScript() {
logger.error('This command must not be launched directly, using duniter.sh script');
return Promise.resolve();
}
function configure(program, server, conf) {
return co(function *() {
if (typeof server == "string" || typeof conf == "string") {
throw constants.ERRORS.CLI_CALLERR_CONFIG;
}
let wiz = wizard();
// UPnP override
if (program.noupnp === true) {
conf.upnp = false;
}
if (program.upnp === true) {
conf.upnp = true;
}
// Network autoconf
const autoconfNet = program.autoconf
|| !(conf.ipv4 || conf.ipv6)
|| !(conf.remoteipv4 || conf.remoteipv6 || conf.remotehost)
|| !(conf.port && conf.remoteport);
if (autoconfNet) {
yield Q.nbind(wiz.networkReconfiguration, wiz)(conf, autoconfNet, program.noupnp);
}
// Try to add an endpoint if provided
if (program.addep) {
if (conf.endpoints.indexOf(program.addep) === -1) {
conf.endpoints.push(program.addep);
}
// Remove it from "to be removed" list
const indexInRemove = conf.rmEndpoints.indexOf(program.addep);
if (indexInRemove !== -1) {
conf.rmEndpoints.splice(indexInRemove, 1);
}
}
// Try to remove an endpoint if provided
if (program.remep) {
if (conf.rmEndpoints.indexOf(program.remep) === -1) {
conf.rmEndpoints.push(program.remep);
}
// Remove it from "to be added" list
const indexInToAdd = conf.endpoints.indexOf(program.remep);
if (indexInToAdd !== -1) {
conf.endpoints.splice(indexInToAdd, 1);
}
}
return server.dal.saveConf(conf)
.then(function () {
try {
logger.debug("Configuration saved.");
return conf;
} catch (e) {
logger.error("Configuration could not be saved: " + e);
throw Error(e);
}
});
});
}
app/modules/daemon.js 0 → 100644
+ 47
− 0
View file @ b7a73680
"use strict";
const co = require('co');
module.exports = {
duniter: {
cli: [{
name: 'start',
desc: 'Start Duniter node daemon.',
onPluggedDALExecute: (server, conf, program, params) => co(function*() {
const logger = server.logger;
const bma = require('../lib/streams/bma');
logger.info(">> NODE STARTING");
// Public http interface
let bmapi = yield bma(server, null, conf.httplogs);
// Routing documents
server.routing();
// Services
yield server.startServices();
yield bmapi.openConnections();
logger.info('>> Server ready!');
return new Promise(() => null); // Never ending
})
},{
name: 'stop',
desc: 'Stop Duniter node daemon.',
logs: false,
onConfiguredExecute: () => needsToBeLaunchedByScript()
},{
name: 'restart',
desc: 'Restart Duniter node daemon.',
logs: false,
onConfiguredExecute: () => needsToBeLaunchedByScript()
}]
}
};
function needsToBeLaunchedByScript() {
console.error('This command must not be launched directly, please use duniter.sh script');
}
index.js
+ 2
− 0
View file @ b7a73680
......@@ -22,6 +22,7 @@ const exportBcDependency = require('./app/modules/export-bc');
const reapplyDependency = require('./app/modules/reapply');
const revertDependency = require('./app/modules/revert');
const peerDependency = require('./app/modules/peer');
const daemonDependency = require('./app/modules/daemon');
const MINIMAL_DEPENDENCIES = [
{ name: 'duniter-config', required: configDependency }
......@@ -38,6 +39,7 @@ const DEFAULT_DEPENDENCIES = [
{ name: 'duniter-reapply', required: reapplyDependency },
{ name: 'duniter-revert', required: revertDependency },
{ name: 'duniter-peer', required: peerDependency },
{ name: 'duniter-daemon', required: daemonDependency },
{ name: 'duniter-keypair', required: dkeypairDependency }
];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment