diff --git a/lib/plugins.js b/lib/plugins.js index fcdef9aa..9dbedfe6 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -191,10 +191,7 @@ exports.logEvent = function event(session, rawEvent) { db.recordDeviceEvent(session, rawEvent); }; -function buildCartridges(rec) { - var cartridges = cachedConfig.exchanges.settings.cartridges; - var virtualCartridges = cachedConfig.exchanges.settings.virtualCartridges; - if (!cartridges) return null; +function buildCartridges(cartridges, virtualCartridges, rec) { return { cartridges: [ { @@ -212,10 +209,14 @@ function buildCartridges(rec) { } 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) { if (err) return cb(err); return cb(null, { - cartridges: buildCartridges(result) + cartridges: buildCartridges(cartridges, virtualCartridges, result) }); }); };