diff --git a/master.js b/master.js index f801181a..d3eac31a 100644 --- a/master.js +++ b/master.js @@ -237,6 +237,7 @@ app.post("/api/place", function(req, res) { recievedItemStatistics = new averagedTimeSeries({ maxEntries: config.itemStats.maxEntries, entriesPerSecond: config.itemStats.entriesPerSecond, + mergeMode: "add", }, console.log); recievedItemStatisticsBySlaveID[x.instanceID] = recievedItemStatistics; } @@ -293,6 +294,7 @@ app.post("/api/remove", function(req, res) { sentItemStatistics = new averagedTimeSeries({ maxEntries: config.itemStats.maxEntries, entriesPerSecond: config.itemStats.entriesPerSecond, + mergeMode: "add", }, console.log); } sentItemStatistics.add({ diff --git a/package-lock.json b/package-lock.json index c8456888..cdb2b301 100644 --- a/package-lock.json +++ b/package-lock.json @@ -222,9 +222,9 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "averaged-timeseries": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/averaged-timeseries/-/averaged-timeseries-1.3.0.tgz", - "integrity": "sha512-RBkKtsOrsv83zVPhr4qBkEIx8cuUKoxQUmsU7fXU0hRbWHr8iDxJRblfy/YsNRl14vxFTdux2kTXp7Fs2kMY1Q==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/averaged-timeseries/-/averaged-timeseries-1.4.0.tgz", + "integrity": "sha512-1WrcZHh/f9g3z36Ckd83n5axXUScLwhfvWFdAiZK29YS48UzPhiYyPWLv0iJGYt9w0iJ0ubTTponL+fUebIkbQ==", "requires": { "assert": "1.4.1" } diff --git a/package.json b/package.json index cc0f5a2e..8c03b880 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "author": "Danielv123", "license": "ISC", "dependencies": { - "averaged-timeseries": "^1.3.0", + "averaged-timeseries": "^1.4.0", "body-parser": "^1.18.2", "canvasjs": "^1.8.1", "child_process": "^1.0.2",