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

Merged in release/2024-10-11 (pull request #1819)

Browse Source 
Release/2024-10-11 - Release into test
This commit is contained in:
Dave Richer
2024-10-17 18:49:11 +00:00
parent 5593a9fa80 23467280b4
commit 8640b94714
5 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@@ -7,7 +7,7 @@ _reference
client client
redis/dockerdata redis/dockerdata
hasura hasura
node_modules
# Files to exclude # Files to exclude
.ebignore .ebignore
.editorconfig .editorconfig

4
Dockerfile
View File

@@ -29,13 +29,13 @@ WORKDIR /app
RUN git config --global --add safe.directory /app RUN git config --global --add safe.directory /app
# Copy package.json and package-lock.json # Copy package.json and package-lock.json
COPY package*.json ./ COPY package.json ./
# Install Nodemon # Install Nodemon
RUN npm install -g nodemon RUN npm install -g nodemon
# Install dependencies # Install dependencies
RUN npm ci RUN npm i --no-package-lock
# Copy the rest of your application code # Copy the rest of your application code
COPY . . COPY . .

10
docker-compose.yml
View File

@@ -14,7 +14,7 @@ services:
context: ./redis context: ./redis
container_name: redis-node-1 container_name: redis-node-1
hostname: redis-node-1 hostname: redis-node-1
restart: always restart: unless-stopped
networks: networks:
- redis-cluster-net - redis-cluster-net
volumes: volumes:
@@ -32,7 +32,7 @@ services:
context: ./redis context: ./redis
container_name: redis-node-2 container_name: redis-node-2
hostname: redis-node-2 hostname: redis-node-2
restart: always restart: unless-stopped
networks: networks:
- redis-cluster-net - redis-cluster-net
volumes: volumes:
@@ -50,7 +50,7 @@ services:
context: ./redis context: ./redis
container_name: redis-node-3 container_name: redis-node-3
hostname: redis-node-3 hostname: redis-node-3
restart: always restart: unless-stopped
networks: networks:
- redis-cluster-net - redis-cluster-net
volumes: volumes:
@@ -70,7 +70,7 @@ services:
hostname: localstack hostname: localstack
networks: networks:
- redis-cluster-net - redis-cluster-net
restart: always restart: unless-stopped
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
environment: environment:
@@ -152,7 +152,7 @@ services:
# image: redislabs/redisinsight:latest # image: redislabs/redisinsight:latest
# container_name: redis-insight # container_name: redis-insight
# hostname: redis-insight # hostname: redis-insight
# restart: always # restart: unless-stopped
# ports: # ports:
# - "3334:5540" # - "3334:5540"
# networks: # networks:

46
server/email/tasksEmails.js
View File

@@ -25,26 +25,32 @@ const tasksEmailQueueCleanup = async () => {
} }
}; };
if (process.env.NODE_ENV !== "development") { // if (process.env.NODE_ENV !== "development") {
// Handling SIGINT (e.g., Ctrl+C) // // Handling SIGINT (e.g., Ctrl+C)
process.on("SIGINT", async () => { // process.on("SIGINT", async () => {
await tasksEmailQueueCleanup(); // console.log("Handling SIGNIT For Tasks Cleanup");
}); // await tasksEmailQueueCleanup();
// Handling SIGTERM (e.g., sent by system shutdown) // process.exit(0);
process.on("SIGTERM", async () => { // });
await tasksEmailQueueCleanup(); // // Handling SIGTERM (e.g., sent by system shutdown)
}); // process.on("SIGTERM", async () => {
// Handling uncaught exceptions // console.log("Handling SIGTERM For Tasks Cleanup");
process.on("uncaughtException", async (err) => { // await tasksEmailQueueCleanup();
await tasksEmailQueueCleanup(); // process.exit(0);
throw err; // });
}); // // Handling uncaught exceptions
// Handling unhandled promise rejections // process.on("uncaughtException", async (err) => {
process.on("unhandledRejection", async (reason, promise) => { // console.log("Handling uncaughtException For Tasks Cleanup");
await tasksEmailQueueCleanup(); // await tasksEmailQueueCleanup();
throw reason; // process.exit(1);
}); // });
} // // Handling unhandled promise rejections
// process.on("unhandledRejection", async (reason, promise) => {
// console.log("Handling unhandledRejection For Tasks Cleanup");
// await tasksEmailQueueCleanup();
// process.exit(1);
// });
// }
/** /**
* Format the date for the email. * Format the date for the email.

2
server/email/tasksEmailsQueue.js
View File

@@ -13,7 +13,7 @@ const taskEmailQueue = () =>
console.log("Processing reminds for taskIds: ", taskIds.join(", ")); console.log("Processing reminds for taskIds: ", taskIds.join(", "));
// Set the remind_at_sent to the current time. // Set the remind_at_sent to the current time.
const now = moment.utc().toISOString(); const now = moment().toISOString();
client client
.request(UPDATE_TASKS_REMIND_AT_SENT, { taskIds, now }) .request(UPDATE_TASKS_REMIND_AT_SENT, { taskIds, now })