admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2024-03-14 (pull request #2142)

Browse Source 
Release/2024 03 14
This commit is contained in:
Dave Richer
2025-03-04 16:58:41 +00:00
parent 2810428d19 7bbbf5934a
commit aa55f4840b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/notifications/queues/appQueue.js
View File

@@ -138,7 +138,7 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
await pubClient.del(userKey); await pubClient.del(userKey);
logger.logger.debug(`Deleted Redis key ${userKey}`); logger.logger.debug(`Deleted Redis key ${userKey}`);
} else { } else {
logger.logger.warn(`No notifications found for ${user} under ${userKey}`); logger.logger.debug(`No notifications found for ${user} under ${userKey}`);
} }
} }
@@ -207,7 +207,7 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
`Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} with notificationId ${notificationId}` `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} with notificationId ${notificationId}`
); );
} else { } else {
logger.logger.warn(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`); logger.logger.debug(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
} }
} }
} }

2
server/notifications/queues/emailQueue.js
View File

@@ -5,7 +5,7 @@ const { InstanceEndpoints } = require("../../utils/instanceMgr");
const { registerCleanupTask } = require("../../utils/cleanupManager"); const { registerCleanupTask } = require("../../utils/cleanupManager");
const EMAIL_CONSOLIDATION_DELAY_IN_MINS = (() => { const EMAIL_CONSOLIDATION_DELAY_IN_MINS = (() => {
const envValue = process.env?.APP_CONSOLIDATION_DELAY_IN_MINS; const envValue = process.env?.EMAIL_CONSOLIDATION_DELAY_IN_MINS;
const parsedValue = envValue ? parseInt(envValue, 10) : NaN; const parsedValue = envValue ? parseInt(envValue, 10) : NaN;
return isNaN(parsedValue) ? 1 : Math.max(1, parsedValue); // Default to 1, ensure at least 1 return isNaN(parsedValue) ? 1 : Math.max(1, parsedValue); // Default to 1, ensure at least 1
})(); })();

2
server/notifications/scenarioParser.js
View File

@@ -16,7 +16,7 @@ const { dispatchEmailsToQueue } = require("./queues/emailQueue");
const { dispatchAppsToQueue } = require("./queues/appQueue"); const { dispatchAppsToQueue } = require("./queues/appQueue");
// If true, the user who commits the action will NOT receive notifications; if false, they will. // If true, the user who commits the action will NOT receive notifications; if false, they will.
const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS === "true"; const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "false";
/** /**
* Parses an event and determines matching scenarios for notifications. * Parses an event and determines matching scenarios for notifications.