Comparing version 0.0.9 to 0.0.10
@@ -63,3 +63,3 @@ var util = require('util'), | ||
return function() { | ||
var tx = request.tx.start('model:'+model.name+':'+name,false,model.filename,model.description); | ||
var tx = request.tx && request.tx.start('model:'+model.name+':'+name,false,model.filename,model.description); | ||
try { | ||
@@ -69,3 +69,3 @@ return fn.apply(scope, arguments); | ||
finally { | ||
tx.end(); | ||
tx && tx.end(); | ||
} | ||
@@ -72,0 +72,0 @@ }; |
@@ -38,6 +38,6 @@ var _ = require('lodash'), | ||
this[name] = function promiseFunction() { | ||
var tx = request.tx.start('connector:'+_connector.name+':'+name,false,_connector.filename,_connector.description); | ||
var tx = request.tx && request.tx.start('connector:'+_connector.name+':'+name,false,_connector.filename,_connector.description); | ||
//create a logger dispatcher that will dispatch each connector logger log also to our request tx log | ||
LogMultiplexer(request, _connector, tx); | ||
workLoggers(request, _connector, tx); | ||
@@ -111,3 +111,3 @@ debug(chalk.magenta.bold('--> '+name)); | ||
async.series(tasks, function completeCallback(err){ | ||
tx.end(); | ||
tx && tx.end(); | ||
if (err) { return callback(err); } | ||
@@ -134,13 +134,13 @@ debug(chalk.magenta.bold('<-- '+name)); | ||
function LogMultiplexer(request, connector, tx) { | ||
function workLoggers(request, connector, tx) { | ||
['info','error','warn','debug','trace'].forEach(function(level){ | ||
var fn = connector.logger[level]; | ||
var fn = connector && connector.logger && connector.logger[level]; | ||
var newfn = function logDispatch() { | ||
fn.apply(connector.logger, arguments); | ||
fn && fn.apply(connector.logger, arguments); | ||
// dispatch to request tx logger | ||
//request.log[level].apply(request.log, arguments); | ||
tx.log[level].apply(tx.log,arguments); | ||
tx && tx.log[level].apply(tx.log,arguments); | ||
}; | ||
connector.logger[level] = newfn; | ||
connector && connector.logger && (connector.logger[level] = newfn); | ||
}); | ||
} |
{ | ||
"name": "api-orm", | ||
"version": "0.0.9", | ||
"version": "0.0.10", | ||
"description": "API Builder ORM", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -562,3 +562,3 @@ var should = require('should'), | ||
should(ExtendedUser.connector).be.equal(Connector); | ||
should(ExtendedUser.fields.name).be.ok; | ||
should(ExtendedUser.fields.name).be.not.ok; | ||
should(ExtendedUser.fields.age).be.ok; | ||
@@ -580,4 +580,4 @@ | ||
should(NewModel).be.an.object; | ||
should(NewModel.fields).have.property('name'); | ||
should(NewModel.fields).have.property('age'); | ||
should(NewModel.fields).not.have.property('name'); | ||
should(NewModel.fields).not.have.property('age'); | ||
should(NewModel.fields).have.property('birthdate'); | ||
@@ -584,0 +584,0 @@ |
91986