Comparing version 1.2.0 to 1.2.5
@@ -16,3 +16,6 @@ var async = require('async'); | ||
*/ | ||
function Barrel( systemName, logger, groupMessages ){ | ||
function Barrel( ){ } | ||
var barrel = Barrel.prototype; | ||
barrel.init = function( systemName, logger, config ){ | ||
this.firestarters = [ ]; | ||
@@ -24,9 +27,13 @@ this.warpers = {}; | ||
this.setWarper( '*', groupMessages ? liner : stopper ); | ||
} | ||
var barrel = Barrel.prototype; | ||
this.setWarper( '*', config.groupMessages ? liner : stopper ); | ||
this.extendedInit( systemName, config ); | ||
}; | ||
barrel.extendedInit = function( systemName, config ){ | ||
}; | ||
barrel.setWarper = function( division, warper ){ | ||
var self = this; | ||
if( this.warpers[division] && warper ){ | ||
if( division && !this.warpers[division] && warper ){ | ||
this.warpers[division] = warper; | ||
@@ -203,3 +210,2 @@ warper.barrel = self; | ||
self.logger.harconlog( err, 'Emitted with: ', { results: results } ); | ||
if( comm.callback ){ | ||
@@ -206,0 +212,0 @@ self.appease( comm, err, results ); |
@@ -94,3 +94,3 @@ var Cerobee = require('clerobee'); | ||
commPrototype.twist = function( name, error, response ) { | ||
var comm = new Communication( this.id, this.flowId, this.externalId, this.division, this.source, this.event, this.params, this.callback, name, error, response ); | ||
var comm = new Communication( this.id, this.flowId, this.externalId, this.division, this.source, this.event, this.params, this.callback, name, error, response ); | ||
return comm; | ||
@@ -149,1 +149,8 @@ }; | ||
}; | ||
exports.importCommunication = function( obj ){ | ||
var c = new Communication( obj.originalId, obj.flowId, obj.externalId, obj.division, obj.source, obj.event, obj.params, obj.callback, obj.target, obj.error, obj.response ); | ||
c.id = obj.id; | ||
c.terms = obj.terms; | ||
return c; | ||
}; |
@@ -164,2 +164,3 @@ var Communication = require('./Communication'); | ||
var serviceFn = this.getServiceFn( comm ); | ||
var callbackFn = function(err, res){ callback( err, comm.twist(self.name, err, res) ); }; | ||
@@ -166,0 +167,0 @@ |
@@ -1,2 +0,1 @@ | ||
var Communication = require('./Communication'); | ||
var Firestarter = require('./Firestarter'); | ||
@@ -3,0 +2,0 @@ |
@@ -8,3 +8,3 @@ var Communication = require('../lib/Communication'); | ||
var VERSION = exports.VERSION = '1.2.0'; | ||
var VERSION = exports.VERSION = '1.2.5'; | ||
@@ -51,8 +51,4 @@ var _ = require('lodash'); | ||
var consoleFn = function() { console.log( arguments ); }; | ||
DummyLogger.prototype.log = consoleFn; | ||
DummyLogger.prototype.silly = consoleFn; | ||
DummyLogger.prototype.debug = consoleFn; | ||
DummyLogger.prototype.verbose = consoleFn; | ||
DummyLogger.prototype.info = consoleFn; | ||
DummyLogger.prototype.warn = consoleFn; | ||
var dlp = DummyLogger.prototype; | ||
dlp.log = dlp.silly = dlp.debug = dlp.verbose = dlp.info = dlp.warn = consoleFn; | ||
DummyLogger.prototype.error = function() { console.error( arguments ); }; | ||
@@ -82,4 +78,9 @@ | ||
this.barrel = new Barrel( this.name, this.logger, options.groupMessages ); | ||
this.Barrel = options.Barrel || Barrel; | ||
this.Firestormstarter = options.Firestormstarter || Firestormstarter; | ||
this.Flamestarter = options.Flamestarter || Flamestarter; | ||
this.barrel = new this.Barrel( ); | ||
this.barrel.init( this.name, this.logger, _.assign( options.barrel || {}, { groupMessages: !!options.groupMessages } ) ); | ||
this.inflicterContext = (this.options.context || {}); | ||
@@ -101,2 +102,5 @@ this.inflicterContext.logger = this.logger; | ||
options: self.options, | ||
Barrel: self.Barrel, | ||
Firestormstarter: self.Firestormstarter, | ||
Flamestarter: self.Flamestarter, | ||
barrel: self.barrel, | ||
@@ -178,3 +182,3 @@ logger: self.logger, | ||
object.inflicterContext = this.inflicterContext; | ||
var fss = new Firestormstarter( this.options, this.barrel, object, this.logger ); | ||
var fss = new this.Firestormstarter( this.options, this.barrel, object, this.logger ); | ||
fss.sliceArguments = this.sliceArguments; | ||
@@ -207,3 +211,3 @@ | ||
inflicter.addict = function( division, name, eventName, fn ){ | ||
var flamestarter = new Flamestarter( this.options, this.barrel, division, name, eventName, fn, this.logger ); | ||
var flamestarter = new this.Flamestarter( this.options, this.barrel, division, name, eventName, fn, this.logger ); | ||
flamestarter.sliceArguments = this.sliceArguments; | ||
@@ -238,2 +242,9 @@ | ||
inflicter.Communication = Communication; | ||
inflicter.Barrel = Barrel; | ||
inflicter.Firestormstarter = Firestormstarter; | ||
inflicter.Flamestarter = Flamestarter; | ||
module.exports = Inflicter; |
{ | ||
"name": "harcon", | ||
"version": "1.2.0", | ||
"version": "1.2.5", | ||
"description": "Messaging/Service Bus for the harmonic convergence of node-based enterprise entities.", | ||
@@ -49,3 +49,3 @@ "keywords": [ | ||
}, | ||
"_id": "harcon@1.2.0" | ||
"_id": "harcon@1.2.5" | ||
} |
991682
16839