Hopiu/webapi-eca
1
0
Fork 0
mirror of https://github.com/Hopiu/webapi-eca.git synced 2026-05-10 08:14:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

architectural changes pushed as far as the server starts running again, just limited

Browse source
This commit is contained in:
Dominic Bosch 2013-11-14 22:27:15 +01:00
parent 11ced9a57e
commit efbb179832
10 changed files with 226 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
js/config.js
View file

@ -1,22 +1,18 @@
'use strict'; 'use strict';
var path = require('path'), log, config; var path = require('path'),
log = require('./logging'),
config;
exports = module.exports = function(relPath) { exports = module.exports = function(args) {
if(typeof relPath !== 'string') relPath = path.join('config', 'config.json');
loadConfigFile(relPath);
};
exports.init = function(args, cb) {
args = args || {}; args = args || {};
if(args.log) log = args.log; log(args);
else log = args.log = require('./logging'); if(typeof args.relPath === 'string') loadConfigFile(args.relPath);
//TODO check all modules whether they can be loaded without calling the module.exports with args
loadConfigFile(path.join('config', 'config.json')); return module.exports;
if(typeof cb === 'function') cb();
}; };
loadConfigFile(path.join('config', 'config.json'));
function loadConfigFile(relPath) { function loadConfigFile(relPath) {
try { try {
@ -73,7 +69,4 @@ exports.getSessionSecret = function() {
return fetchProp('session_secret'); return fetchProp('session_secret');
}; };
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};

60
js/db_interface.js
View file

@ -12,31 +12,28 @@
// (e.g. action\_module\_probinder). // (e.g. action\_module\_probinder).
'use strict'; 'use strict';
var log, crypto_key, db, var redis = require('redis'),
redis = require('redis'), crypto = require('crypto'),
crypto = require('crypto'); log = require('./logging'),
crypto_key, db;
/** /**
* Initializes the DB connection. Requires a valid configuration file which contains * Initializes the DB connection. Requires a valid configuration file which contains
* a db port and a crypto key. * a db port and a crypto key.
* @param args {Object} * @param args {Object}
* @param cb {function}
*/ */
exports.init = function(args, cb) { exports = module.exports = function(args) {
args = args || {}; args = args || {};
if(args.log) log = args.log; log(args);
else log = args.log = require('./logging');
var config = require('./config'); var config = require('./config')(args);
config.init(args);
crypto_key = config.getCryptoKey(); crypto_key = config.getCryptoKey();
db = redis.createClient(config.getDBPort()); db = redis.createClient(config.getDBPort());
db.on("error", function (err) { db.on("error", function (err) {
err.addInfo = 'message from DB'; err.addInfo = 'message from DB';
log.error('DB', err); log.error('DB', err);
}); });
return module.exports;
if(typeof cb === 'function') cb();
}; };
/** /**
@ -93,7 +90,7 @@ function replyHandler(action) {
* arguments (err, obj) * arguments (err, obj)
*/ */
function getSetRecords(set, funcSingle, callback) { function getSetRecords(set, funcSingle, callback) {
db.smembers(set, function(err, reply) { if(db) db.smembers(set, function(err, reply) {
if(err) log.error('DB', 'fetching ' + set + ': ' + err); if(err) log.error('DB', 'fetching ' + set + ': ' + err);
else { else {
if(reply.length === 0) { if(reply.length === 0) {
@ -124,7 +121,7 @@ function getSetRecords(set, funcSingle, callback) {
// @method shutDown() // @method shutDown()
// Shuts down the db link. // Shuts down the db link.
exports.shutDown = function() { db.quit(); }; exports.shutDown = function() { if(db) db.quit(); };
// ## Action Modules // ## Action Modules
@ -135,8 +132,10 @@ exports.shutDown = function() { db.quit(); };
* @param {String} data the string representation * @param {String} data the string representation
*/ */
exports.storeActionModule = function(id, data) { exports.storeActionModule = function(id, data) {
db.sadd('action_modules', id, replyHandler('storing action module key ' + id)); if(db) {
db.set('action_module_' + id, data, replyHandler('storing action module ' + id)); db.sadd('action_modules', id, replyHandler('storing action module key ' + id));
db.set('action_module_' + id, data, replyHandler('storing action module ' + id));
}
}; };
/** /**
@ -146,7 +145,7 @@ exports.storeActionModule = function(id, data) {
* @param {function} callback the callback to receive the answer (err, obj) * @param {function} callback the callback to receive the answer (err, obj)
*/ */
exports.getActionModule = function(id, callback) { exports.getActionModule = function(id, callback) {
if(callback) db.get('action_module_' + id, callback); if(callback && db) db.get('action_module_' + id, callback);
}; };
/** /**
@ -165,7 +164,7 @@ exports.getActionModules = function(callback) {
* @param {String} data the string representation * @param {String} data the string representation
*/ */
exports.storeActionModuleAuth = function(id, data) { exports.storeActionModuleAuth = function(id, data) {
if(data) { if(data && db) {
db.sadd('action_modules_auth', id, replyHandler('storing action module auth key ' + id)); db.sadd('action_modules_auth', id, replyHandler('storing action module auth key ' + id));
db.set('action_module_' + id +'_auth', encrypt(data), replyHandler('storing action module auth ' + id)); db.set('action_module_' + id +'_auth', encrypt(data), replyHandler('storing action module auth ' + id));
} }
@ -178,7 +177,7 @@ exports.storeActionModuleAuth = function(id, data) {
* @param {function} callback the callback to receive the answer (err, obj) * @param {function} callback the callback to receive the answer (err, obj)
*/ */
exports.getActionModuleAuth = function(id, callback) { exports.getActionModuleAuth = function(id, callback) {
if(callback) db.get('action_module_' + id + '_auth', function(err, txt) { callback(err, decrypt(txt)); }); if(callback && db) db.get('action_module_' + id + '_auth', function(err, txt) { callback(err, decrypt(txt)); });
}; };
// ## Event Modules // ## Event Modules
@ -190,8 +189,10 @@ exports.getActionModuleAuth = function(id, callback) {
* @param {String} data the string representation * @param {String} data the string representation
*/ */
exports.storeEventModule = function(id, data) { exports.storeEventModule = function(id, data) {
db.sadd('event_modules', id, replyHandler('storing event module key ' + id)); if(db) {
db.set('event_module_' + id, data, replyHandler('storing event module ' + id)); db.sadd('event_modules', id, replyHandler('storing event module key ' + id));
db.set('event_module_' + id, data, replyHandler('storing event module ' + id));
}
}; };
/** /**
@ -201,7 +202,7 @@ exports.storeEventModule = function(id, data) {
* @param {function} callback the callback to receive the answer (err, obj) * @param {function} callback the callback to receive the answer (err, obj)
*/ */
exports.getEventModule = function(id, callback) { exports.getEventModule = function(id, callback) {
if(callback) db.get('event_module_' + id, callback); if(callback && db) db.get('event_module_' + id, callback);
}; };
/** /**
@ -220,7 +221,7 @@ exports.getEventModules = function(callback) {
* @param {String} data the string representation * @param {String} data the string representation
*/ */
exports.storeEventModuleAuth = function(id, data) { exports.storeEventModuleAuth = function(id, data) {
if(data) { if(data && db) {
db.sadd('event_modules_auth', id, replyHandler('storing event module auth key ' + id)); db.sadd('event_modules_auth', id, replyHandler('storing event module auth key ' + id));
db.set('event_module_' + id +'_auth', encrypt(data), replyHandler('storing event module auth ' + id)); db.set('event_module_' + id +'_auth', encrypt(data), replyHandler('storing event module auth ' + id));
} }
@ -243,8 +244,10 @@ exports.getEventModuleAuth = function(id, callback) {
// @param {String} id the unique identifier of the rule // @param {String} id the unique identifier of the rule
// @param {String} data the string representation // @param {String} data the string representation
exports.storeRule = function(id, data) { exports.storeRule = function(id, data) {
db.sadd('rules', id, replyHandler('storing rule key ' + id)); if(db) {
db.set('rule_' + id, data, replyHandler('storing rule ' + id)); db.sadd('rules', id, replyHandler('storing rule key ' + id));
db.set('rule_' + id, data, replyHandler('storing rule ' + id));
}
}; };
// @method getRule(id, callback) // @method getRule(id, callback)
@ -253,7 +256,7 @@ exports.storeRule = function(id, data) {
// @param {String} id the rule id // @param {String} id the rule id
// @param {function} callback the callback to receive the answer (err, obj) // @param {function} callback the callback to receive the answer (err, obj)
exports.getRule = function(id, callback) { exports.getRule = function(id, callback) {
db.get('rule_' + id, callback); if(db) db.get('rule_' + id, callback);
}; };
// @method getRules(callback) // @method getRules(callback)
@ -270,13 +273,8 @@ exports.getRules = function(callback) {
* @param {Object} objUser * @param {Object} objUser
*/ */
exports.storeUser = function(cb, objUser) { exports.storeUser = function(cb, objUser) {
if(objUser && objUser.id) { if(db && objUser && objUser.id) {
db.sadd('users', objUser.id, replyHandler('storing user key ' + objUser.id)); db.sadd('users', objUser.id, replyHandler('storing user key ' + objUser.id));
db.set('user:' + objUser.id, data, replyHandler('storing user properties ' + objUser.id)); db.set('user:' + objUser.id, data, replyHandler('storing user properties ' + objUser.id));
} }
}; };
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};

66
js/engine.js
View file

@ -1,35 +1,22 @@
'use strict'; 'use strict';
var log, ml;
exports.init = function(args, cb) {
args = args || {};
if(args.log) log = args.log;
else log = args.log = require('./logging');
ml = require('./module_loader').init(args);
if(typeof cb === 'function') cb();
};
var path = require('path'), var path = require('path'),
cp = require('child_process'), cp = require('child_process'),
poller, db, isRunning = true, log = require('./logging'),
qEvents = new (require('./queue')).Queue(); // export queue into redis qEvents = new (require('./queue')).Queue(), //TODO export queue into redis
regex = /\$X\.[\w\.\[\]]*/g, // find properties of $X
listRules = {},
listActionModules = {},
isRunning = true,
actionsLoaded = false,
eventsLoaded = false,
ml, poller, db;
var regex = /\$X\.[\w\.\[\]]*/g, // find properties of $X exports = module.exports = function(args) {
listRules = {}, args = args || {};
listActionModules = {}, log(args);
actionsLoaded = false, eventsLoaded = false; ml = require('./module_loader')(args);
/* poller = cp.fork(path.resolve(__dirname, 'eventpoller'), [log.getLogType()]);
* Initialize the rules engine which initializes the module loader.
* @param {Object} db_link the link to the db, see [db\_interface](db_interface.html)
* @param {String} db_port the db port
* @param {String} crypto_key the key to be used for encryption on the db, max legnth 256
*/
exports.addDBLink = function(db_link) {
db = db_link;
loadActions();
poller = cp.fork(path.resolve(__dirname, 'eventpoller'));
poller.on('message', function(evt) { poller.on('message', function(evt) {
if(evt.event === 'ep_finished_loading') { if(evt.event === 'ep_finished_loading') {
eventsLoaded = true; eventsLoaded = true;
@ -38,10 +25,19 @@ exports.addDBLink = function(db_link) {
}); });
//start to poll the event queue //start to poll the event queue
pollQueue(); pollQueue();
return module.exports;
}; };
function loadActions() { /*
db.getActionModules(function(err, obj) { * Initialize the rules engine which initializes the module loader.
* @param {Object} db_link the link to the db, see [db\_interface](db_interface.html)
* @param {String} db_port the db port
* @param {String} crypto_key the key to be used for encryption on the db, max legnth 256
*/
exports.addDBLink = function(db_link) { db = db_link; };
exports.loadActions = function(cb) {
if(ml && db) db.getActionModules(function(err, obj) {
if(err) log.error('EN', 'retrieving Action Modules from DB!'); if(err) log.error('EN', 'retrieving Action Modules from DB!');
else { else {
if(!obj) { if(!obj) {
@ -66,12 +62,13 @@ function loadActions() {
listActionModules[el] = m; listActionModules[el] = m;
} }
} }
} }
}); });
} else log.severe('EN', new Error('Module Loader not defined!'));
};
function tryToLoadRules() { function tryToLoadRules() {
if(eventsLoaded && actionsLoaded) { if(db && eventsLoaded && actionsLoaded) {
db.getRules(function(err, obj) { db.getRules(function(err, obj) {
for(var el in obj) exports.loadRule(JSON.parse(obj[el])); for(var el in obj) exports.loadRule(JSON.parse(obj[el]));
}); });
@ -252,8 +249,3 @@ exports.shutDown = function() {
if(poller) poller.send('cmd|shutdown'); if(poller) poller.send('cmd|shutdown');
if(db) db.shutDown(); if(db) db.shutDown();
}; };
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};

121
js/eventpoller.js
View file

@ -2,63 +2,64 @@
'use strict'; 'use strict';
var log, db, ml;
function init() {
log = require('./logging');
if(process.argv.length > 2) log(parseInt(process.argv[2]) || 0);
ml = require('./module_loader').init({ log: log }),
db = require('./db_interface').init({ log: log }, doneInitDB);
if(typeof cb === 'function') cb();
};
var fs = require('fs'), var fs = require('fs'),
path = require('path'), path = require('path'),
listMessageActions = {}, log = require('./logging'),
listAdminCommands = {}, listMessageActions = {},
listEventModules = {}, listAdminCommands = {},
listPoll = {}, //TODO this will change in the future because it could have listEventModules = {},
//several parameterized (user-specific) instances of each event module listPoll = {}, //TODO this will change in the future because it could have
isRunning = true, //several parameterized (user-specific) instances of each event module
eId = 0; isRunning = true,
eId = 0,
db, ml;
//TODO allow different polling intervals (a wrapper together with settimeout per to be polled could be an easy and solution) //TODO allow different polling intervals (a wrapper together with settimeout per to be polled could be an easy and solution)
function doneInitDB(err) {
if(!err) { function init() {
//FIXME ensure eventpoller receives the log method from the engine
console.log('EP receives args:');
console.log('logmeth: ' + parseInt(process.argv[2]) || 0);
console.log(process.argv);
if(process.argv.length > 2) log({ logType: parseInt(process.argv[2]) || 0 });
var args = { logType: log.getLogType() };
ml = require('./module_loader')(args);
db = require('./db_interface')(args);
initAdminCommands();
initMessageActions();
loadEventModules();
pollLoop();
};
function loadEventModules() {
//TODO eventpoller will not load event modules from filesystem, this will be done by //TODO eventpoller will not load event modules from filesystem, this will be done by
// the moduel manager and the eventpoller receives messages about new/updated active rules // the moduel manager and the eventpoller receives messages about new/updated active rules
db.getEventModules(function(err, obj) { if(db && ml) db.getEventModules(function(err, obj) {
if(err) log.error('EP', 'retrieving Event Modules from DB!'); if(err) log.error('EP', 'retrieving Event Modules from DB!');
else { else {
if(!obj) { if(!obj) {
log.print('EP', 'No Event Modules found in DB!'); log.print('EP', 'No Event Modules found in DB!');
process.send({ event: 'ep_finished_loading' }); process.send({ event: 'ep_finished_loading' });
} else { } else {
var m, semaphore = 0; var m, semaphore = 0;
for(var el in obj) { for(var el in obj) {
semaphore++; semaphore++;
m = ml.requireFromString(obj[el], el); log.print('EP', 'Loading Event Module: ' + el);
db.getEventModuleAuth(el, function(mod) { m = ml.requireFromString(obj[el], el);
return function(err, obj) { db.getEventModuleAuth(el, function(mod) {
if(--semaphore === 0) process.send({ event: 'ep_finished_loading' }); return function(err, obj) {
if(obj && mod.loadCredentials) mod.loadCredentials(JSON.parse(obj)); if(--semaphore === 0) process.send({ event: 'ep_finished_loading' });
}; if(obj && mod.loadCredentials) mod.loadCredentials(JSON.parse(obj));
}(m)); };
log.print('EP', 'Loading Event Module: ' + el); }(m));
listEventModules[el] = m; listEventModules[el] = m;
}
} }
initAdminCommands();
initMessageActions();
} }
}); }
} else { });
err.addInfo = 'eventpoller init failed';
log.error('EP', err);
}
} }
function initMessageActions() { function initMessageActions() {
@ -101,22 +102,24 @@ function initMessageActions() {
function initAdminCommands() { function initAdminCommands() {
listAdminCommands['loadevent'] = function(args) { listAdminCommands['loadevent'] = function(args) {
ml.loadModule('mod_events', args[2], loadEventCallback); if(ml) ml.loadModule('mod_events', args[2], loadEventCallback);
}; };
listAdminCommands['loadevents'] = function(args) { listAdminCommands['loadevents'] = function(args) {
ml.loadModules('mod_events', loadEventCallback); if(ml) ml.loadModules('mod_events', loadEventCallback);
}; };
listAdminCommands['shutdown'] = function(args) { listAdminCommands['shutdown'] = function(args) {
log.print('EP', 'Shutting down DB Link'); log.print('EP', 'Shutting down DB Link');
isRunning = false; isRunning = false;
db.shutDown(); if(db) db.shutDown();
}; };
} }
function loadEventCallback(name, data, mod, auth) { function loadEventCallback(name, data, mod, auth) {
db.storeEventModule(name, data); // store module in db if(db) {
if(auth) db.storeEventModuleAuth(name, auth); db.storeEventModule(name, data); // store module in db
listEventModules[name] = mod; // store compiled module for polling if(auth) db.storeEventModuleAuth(name, auth);
listEventModules[name] = mod; // store compiled module for polling
}
} }
function checkRemotes() { function checkRemotes() {
@ -155,11 +158,5 @@ function pollLoop() {
setTimeout(pollLoop, 10000); setTimeout(pollLoop, 10000);
} }
} }
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};
init();
init();
pollLoop();

40
js/http_listener.js
View file

@ -2,23 +2,25 @@
// Isso // Isso
'use strict'; 'use strict';
var log, config;
exports.init = function(args, cb) {
args = args || {};
if(args.log) log = args.log;
else log = args.log = require('./logging');
config = require('./config').init(args);
if(typeof cb === 'function') cb();
};
var path = require('path'), var path = require('path'),
express = require('express'), express = require('express'),
app = express(), app = express(),
RedisStore = require('connect-redis')(express), RedisStore = require('connect-redis')(express),
qs = require('querystring'), qs = require('querystring'),
adminHandler, eventHandler, server; log = require('./logging'),
sess_sec = '#C[>;j`@".TXm2TA;A2Tg)',
db_port, http_port, server,
adminHandler, eventHandler;
exports = module.exports = function(args) {
args = args || {};
log(args);
var config = require('./config')(args);
db_port = config.getDBPort(),
sess_sec = config.getSessionSecret(),
http_port = config.getHttpPort();
return module.exports;
};
exports.addHandlers = function(funcAdminHandler, funcEvtHandler) { exports.addHandlers = function(funcAdminHandler, funcEvtHandler) {
if(!funcEvtHandler) { if(!funcEvtHandler) {
@ -37,9 +39,6 @@ exports.addHandlers = function(funcAdminHandler, funcEvtHandler) {
app.use('/rulesforge/', express.static(path.resolve(__dirname, '..', 'webpages', 'rulesforge'))); app.use('/rulesforge/', express.static(path.resolve(__dirname, '..', 'webpages', 'rulesforge')));
app.get('/admin', onAdminCommand); app.get('/admin', onAdminCommand);
app.post('/pushEvents', onPushEvent); app.post('/pushEvents', onPushEvent);
var db_port = config.getDBPort(),
sess_sec = config.getSessionSecret(),
http_port = config.getHttpPort();
if(db_port) { if(db_port) {
app.use(express.session({ app.use(express.session({
store: new RedisStore({ store: new RedisStore({
@ -54,11 +53,7 @@ exports.addHandlers = function(funcAdminHandler, funcEvtHandler) {
})); }));
log.print('HL', 'Added redis DB as session backbone'); log.print('HL', 'Added redis DB as session backbone');
} else { } else {
if(sess_sec) app.use(express.session({secret: sess_sec})); app.use(express.session({secret: sess_sec}));
else {
app.use(express.session({ secret: '#C[>;j`@".TXm2TA;A2Tg)' }));
log.print('HL', 'no session secret found?!');
}
log.print('HL', 'no session backbone'); log.print('HL', 'no session backbone');
} }
if(http_port) server = app.listen(http_port); // inbound event channel if(http_port) server = app.listen(http_port); // inbound event channel
@ -136,8 +131,3 @@ exports.shutDown = function() {
log.print('HL', 'Shutting down HTTP listener'); log.print('HL', 'Shutting down HTTP listener');
process.exit(); // This is a bit brute force... process.exit(); // This is a bit brute force...
}; };
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};

16
js/logging.js
View file

@ -3,21 +3,25 @@
* ======= * =======
* Functions to handle logging and errors. * Functions to handle logging and errors.
* *
* Valid log methods are: * Valid log types are:
* *
* - 0 standard I/O * - 0 standard I/O
* - 1 file * - 1 file
* - 2 silent * - 2 silent
*/ */
var logMethods = [ flushToConsole, flushToFile, null], var logTypes = [ flushToConsole, flushToFile, null],
logMethod = 0, logFile; logType = 0, logFile;
exports = module.exports = function(logMeth) { exports = module.exports = function(args) {
if(logMeth) logMethod = parseInt(logMeth) || 0; args = args || {};
if(args.logType) logType = parseInt(args.logType) || 0;
return module.exports;
}; };
exports.getLogType = function() { return logType; };
function flush(err, msg) { function flush(err, msg) {
if(typeof logMethods[logMethod] === 'function') logMethods[logMethod](err, msg); if(typeof logTypes[logType] === 'function') logTypes[logType](err, msg);
} }
function flushToConsole(err, msg) { function flushToConsole(err, msg) {

19
js/module_loader.js
View file

@ -1,16 +1,15 @@
'use strict'; 'use strict';
var log; var fs = require('fs'),
exports.init = function(args, cb) { path = require('path'),
log = require('./logging');
exports = module.exports = function(args) {
args = args || {}; args = args || {};
if(args.log) log = args.log; log(args);
else log = args.log = require('./logging'); return module.exports;
if(typeof cb === 'function') cb();
}; };
var fs = require('fs'),
path = require('path');
exports.requireFromString = function(src, name, dir) { exports.requireFromString = function(src, name, dir) {
if(!dir) dir = __dirname; if(!dir) dir = __dirname;
//FIXME load modules only into a safe environment with given modules, no access to whole application //FIXME load modules only into a safe environment with given modules, no access to whole application
@ -71,8 +70,4 @@ exports.loadModules = function(directory, callback) {
}); });
}); });
}; };
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};

35
js/module_manager.js
View file

@ -9,20 +9,17 @@
'use strict'; 'use strict';
var log, ml;
exports.init = function(args, cb) {
args = args || {};
if(args.log) log = args.log;
else log = args.log = require('./logging');
ml = require('./module_loader').init(args);
if(typeof cb === 'function') cb();
};
var fs = require('fs'), var fs = require('fs'),
path = require('path'), path = require('path'),
db = null, funcLoadAction, funcLoadRule; log = require('./logging'),
ml, db, funcLoadAction, funcLoadRule;
exports = module.exports = function(args) {
args = args || {};
log(args);
ml = require('./module_loader')(args);
return module.exports;
};
exports.addHandlers = function(db_link, fLoadAction, fLoadRule) { exports.addHandlers = function(db_link, fLoadAction, fLoadRule) {
db = db_link; db = db_link;
@ -95,18 +92,16 @@ function loadActionCallback(name, data, mod, auth) {
} }
exports.loadActionModule = function (args, answHandler) { exports.loadActionModule = function (args, answHandler) {
if(args && args.name) { if(ml && args && args.name) {
answHandler.answerSuccess('Loading action module ' + args.name + '...'); answHandler.answerSuccess('Loading action module ' + args.name + '...');
ml.loadModule('mod_actions', args.name, loadActionCallback); ml.loadModule('mod_actions', args.name, loadActionCallback);
} }
}; };
exports.loadActionModules = function(args, answHandler) { exports.loadActionModules = function(args, answHandler) {
answHandler.answerSuccess('Loading action modules...'); if(ml) {
ml.loadModules('mod_actions', loadActionCallback); answHandler.answerSuccess('Loading action modules...');
}; ml.loadModules('mod_actions', loadActionCallback);
}
exports.die = function(cb) {
if(typeof cb === 'function') cb();
}; };

116
js/server.js
View file

@ -24,85 +24,49 @@ dog's back.
*/ */
//FIXME server should be started via command line arguments http_port and logging level to allow proper testing //FIXME server should be started via command line arguments http_port and logging level to allow proper testing
var log = require('./logging'), http_port;
log.print('RS', 'STARTING SERVER');
if(process.argv.length > 2) log(process.argv[2]);
else log.print('RS', 'No log method passed, using stdI/O');
if(process.argv.length > 3) http_port = parseInt(process.argv[3]);
else log.print('RS', 'No HTTP port passed, using standard port from config file');
var fs = require('fs'), var fs = require('fs'),
path = require('path'), path = require('path'),
procCmds = { log = require('./logging'),
'die': function() { shutDown(); } procCmds = {
}; 'die': function() { shutDown(); }
},
semaphore = 0,
args = {},
http_listener, mm, db, engine, objCmds;
function init() {
log.print('RS', 'STARTING SERVER');
function handleModuleLoad(cb, msg) { if(process.argv.length > 2) {
return function(err) { args.logType = parseInt(process.argv[2]) || 0 ;
if(!err) { log(args);
if(typeof cb === 'function') cb(); } else log.print('RS', 'No log method passed, using stdI/O');
log.print('RS', msg + ' initialized successfully');
} else { if(process.argv.length > 3) args.http_port = parseInt(process.argv[3]);
err.addInfo = msg + ' init failed'; else log.print('RS', 'No HTTP port passed, using standard port from config file');
log.error('RS', err);
} engine = require('./engine')(args);
http_listener = require('./http_listener')(args);
mm = require('./module_manager')(args);
db = require('./db_interface')(args);
log.print('RS', 'Initialzing DB');
objCmds = {
'loadrules': mm.loadRulesFile,
'loadaction': mm.loadActionModule,
'loadactions': mm.loadActionModules,
'loadevent': engine.loadEventModule,
'loadevents': engine.loadEventModules,
'shutdown': shutDown
}; };
engine.addDBLink(db);
log.print('RS', 'Initialzing http listener');
http_listener.addHandlers(handleAdminCommands, engine.pushEvent);
log.print('RS', 'Initialzing module manager');
mm.addHandlers(db, engine.loadActionModule, engine.loadRule);
//FIXME load actions and events, then rules, do this here, visible for everybody on the first glance
//TODO for such events we should forge the architecture more into an event driven one
} }
function loadHL() {
http_listener = require('./http_listener').init(log,
handleModuleLoad(loadEN, 'http listener')
);
}
function loadEN(cb) {
engine = require('./engine').init(log,
handleModuleLoad(loadMM, 'engine')
);
}
function loadMM(cb) {
mm = require('./module_manager').init(log,
handleModuleLoad(loadDB, 'module manager')
);
}
function loadDB(cb) {
db = require('./db_interface').init(log,
handleModuleLoad(doneInitDB, 'db interface init failed')
);
}
function doneInitDB(err) {
if(!err) {
objCmds = {
'loadrules': mm.loadRulesFile,
'loadaction': mm.loadActionModule,
'loadactions': mm.loadActionModules,
'loadevent': engine.loadEventModule,
'loadevents': engine.loadEventModules,
'shutdown': shutDown
};
//FIXME engine requires db to be finished with init...
engine.addDBLink(db);
log.print('RS', 'Initialzing http listener');
http_listener.addHandlers(handleAdminCommands, engine.pushEvent);
log.print('RS', 'Initialzing module manager');
mm.addHandlers(db, engine.loadActionModule, engine.loadRule);
}
else {
err.addInfo = err.message;
err.message = 'Not Starting engine!';
log.error(err);
}
}
(function() {
loadHL();
// engine = require('./engine').init(log),
// mm = require('./module_manager').init(log),
// db = require('./db_interface').init(log, doneInitDB), //TODO have a close lok at this special case
})();
function handleAdminCommands(args, answHandler) { function handleAdminCommands(args, answHandler) {
if(args && args.cmd) { if(args && args.cmd) {
@ -134,8 +98,6 @@ process.on('message', function(cmd) {
else console.error('err with command'); else console.error('err with command');
}); });
log.print('RS', 'Initialzing DB');
//FIXME initialization of all modules should depend on one after the other //FIXME initialization of all modules should depend on one after the other
// in a transaction style manner // in a transaction style manner
@ -153,3 +115,5 @@ log.print('RS', 'Initialzing DB');
* - init(args, cb) * - init(args, cb)
* - die() * - die()
*/ */
init();

32
js/users.js
View file

@ -1,20 +1,19 @@
'use strict'; 'use strict';
var log; var log = require('./logging'),
exports.init = function(args, cb) { objCmds = {
args = args || {}; addUser: addUser,
if(args.log) log = args.log; getUser: getUser,
else log = args.log = require('./logging'); delUser: delUser,
if(typeof cb === 'function') cb(); addRule: addRule,
}; getRules: getRules,
delRule: delRule
};
var objCmds = { exports = module.exports = function(args) {
addUser: addUser, args = args || {};
getUser: getUser, log(args);
delUser: delUser, return module.exports;
addRule: addRule,
getRules: getRules,
delRule: delRule
}; };
exports.handleCommand = function(args, cb) { exports.handleCommand = function(args, cb) {
@ -80,8 +79,3 @@ function getRule(args, cb) {
function delRule(args, cb) { function delRule(args, cb) {
} }
exports.die = function(cb) {
if(typeof cb === 'function') cb();
};