Merge branch 'master' into SER-1645-clean-up-old-fcm-api-related-code

Countly · Sep 19, 2024 · 4f63185 · 4f63185
2 parents 31de0ac + 839010d
commit 4f63185
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/bin/scripts/expire-data/countly_single_app_expireDataBatches.js b/bin/scripts/expire-data/countly_single_app_expireDataBatches.js
@@ -209,7 +209,7 @@ function processDrillCollection(collection, seconds, callback) {
 
     function generateIterationList(z) {
         z = (start === 0 && z) ? z : start;
-        if (timeSpan === 0 && start === 0) {
+        if (timeSpan === 0 && z === 0) {
             listed.push({"collection": collection.collection, "db": collection.db, "start": 0, "end": end, "query": {"ts": {"$lt": end}}});
         }
         else if (timeSpan === 0) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "puppeteer": "17.1.3",
     "sass": "1.78.0",
     "tslib": "^2.6.3",
-    "uglify-js": "3.18.0",
+    "uglify-js": "3.19.3",
     "underscore": "1.13.7",
     "xlsx-write-stream": "^1.0.0"
   },