lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix cartridges bug

Browse source
This commit is contained in:
Josh Harvey 2015-04-29 11:49:11 -04:00
parent 7f0d0f0758
commit 12cc7dab30
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/plugins.js
View file

@ -191,10 +191,7 @@ exports.logEvent = function event(session, rawEvent) {
db.recordDeviceEvent(session, rawEvent); db.recordDeviceEvent(session, rawEvent);
}; };
function buildCartridges(rec) { function buildCartridges(cartridges, virtualCartridges, rec) {
var cartridges = cachedConfig.exchanges.settings.cartridges;
var virtualCartridges = cachedConfig.exchanges.settings.virtualCartridges;
if (!cartridges) return null;
return { return {
cartridges: [ cartridges: [
{ {
@ -212,10 +209,14 @@ function buildCartridges(rec) {
} }
exports.pollQueries = function pollQueries(session, cb) { exports.pollQueries = function pollQueries(session, cb) {
var cartridges = cachedConfig.exchanges.settings.cartridges;
if (!cartridges) return null;
var virtualCartridges = cachedConfig.exchanges.settings.virtualCartridges;
db.cartridgeCounts(session, function(err, result) { db.cartridgeCounts(session, function(err, result) {
if (err) return cb(err); if (err) return cb(err);
return cb(null, { return cb(null, {
cartridges: buildCartridges(result) cartridges: buildCartridges(cartridges, virtualCartridges, result)
}); });
}); });
}; };