Update store-cleanup-job.js

Adjusted the store cleanup so it now also clears out cases that have arrived via the socket interface, which has a different prefix - `c:`.

Author: paul-graham

app/job/store-cleanup-job.js

@@ -6,10 +6,10 @@ const redis = require('../redis/redis-client');
 const { logPipelineFailures } = redis;
 const REDIS_ACTIVITY_KEY_PREFIX = config.get('redis.keyPrefix');
 
-const scanExistingCasesKeys = (f) => {
+const scanExistingCasesKeys = (f, prefix) => {
   const stream = redis.scanStream({
     // only returns keys following the pattern
-    match: `${REDIS_ACTIVITY_KEY_PREFIX}case:*`,
+    match: `${REDIS_ACTIVITY_KEY_PREFIX}${prefix}:*`,
     // returns approximately 100 elements per call
     count: 100,
   });
@@ -26,7 +26,7 @@ const scanExistingCasesKeys = (f) => {
   });
 };
 
-const getCasesWithActivities = (f) => scanExistingCasesKeys(f);
+const getCasesWithActivities = (f, prefix) => scanExistingCasesKeys(f, prefix);
 
 const cleanupActivitiesCommand = (key) => ['zremrangebyscore', key, '-inf', Date.now()];
 
@@ -38,6 +38,11 @@ const pipeline = (cases) => {
 
 const storeCleanup = () => {
   debug('store cleanup starting...');
+  cleanCasesWithPrefix('case'); // Cases via RESTful interface.
+  cleanCasesWithPrefix('c'); // Cases via socket interface.
+};
+
+const cleanCasesWithPrefix = (prefix) => {
   getCasesWithActivities((cases) => {
     // scan returns the prefixed keys. Remove them since the redis client will add it back
     const casesWithoutPrefix = cases.map((k) => k.replace(REDIS_ACTIVITY_KEY_PREFIX, ''));
@@ -48,7 +53,7 @@ const storeCleanup = () => {
       .catch((err) => {
         debug('Error in getCasesWithActivities', err.message);
       });
-  });
+  }, prefix);
 };
 
 exports.start = (crontab) => {