From 25e6e61d10971a8a84438e89c0c581cc87aee14c Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Fri, 11 Oct 2024 22:59:44 -0400 Subject: [PATCH 1/5] release/2024-10-11: Final touchups Signed-off-by: Dave Richer --- .dockerignore | 2 +- Dockerfile | 4 ++-- docker-compose.yml | 15 ++++++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.dockerignore b/.dockerignore index b6ef4a047..17605d357 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,7 +7,7 @@ _reference client redis/dockerdata hasura - +node_modules # Files to exclude .ebignore .editorconfig diff --git a/Dockerfile b/Dockerfile index 01a1522cd..27a8254e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,13 +29,13 @@ WORKDIR /app RUN git config --global --add safe.directory /app # Copy package.json and package-lock.json -COPY package*.json ./ +COPY package.json ./ # Install Nodemon RUN npm install -g nodemon # Install dependencies -RUN npm ci +RUN npm i --no-package-lock # Copy the rest of your application code COPY . . diff --git a/docker-compose.yml b/docker-compose.yml index dd8dac175..8b38349fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: context: ./redis container_name: redis-node-1 hostname: redis-node-1 - restart: always + restart: unless-stopped networks: - redis-cluster-net volumes: @@ -32,7 +32,7 @@ services: context: ./redis container_name: redis-node-2 hostname: redis-node-2 - restart: always + restart: unless-stopped networks: - redis-cluster-net volumes: @@ -50,7 +50,7 @@ services: context: ./redis container_name: redis-node-3 hostname: redis-node-3 - restart: always + restart: unless-stopped networks: - redis-cluster-net volumes: @@ -70,7 +70,7 @@ services: hostname: localstack networks: - redis-cluster-net - restart: always + restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock environment: @@ -134,6 +134,11 @@ services: condition: service_completed_successfully ports: - "4000:4000" + develop: + watch: + # rebuild image and recreate service + - path: package.json + action: rebuild volumes: - .:/app - node-app-npm-cache:/app/node_modules @@ -152,7 +157,7 @@ services: # image: redislabs/redisinsight:latest # container_name: redis-insight # hostname: redis-insight -# restart: always +# restart: unless-stopped # ports: # - "3334:5540" # networks: From 8a047d14a18f3878c63878336f79a21b6a14bbff Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Fri, 11 Oct 2024 23:51:39 -0400 Subject: [PATCH 2/5] release/2024-10-11: Final touchups Signed-off-by: Dave Richer --- docker-compose.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8b38349fc..57232cdfb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -134,11 +134,6 @@ services: condition: service_completed_successfully ports: - "4000:4000" - develop: - watch: - # rebuild image and recreate service - - path: package.json - action: rebuild volumes: - .:/app - node-app-npm-cache:/app/node_modules From 87d3ceb4085e614529ad163638a693ee9bbf9efa Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Sat, 12 Oct 2024 12:05:13 -0400 Subject: [PATCH 3/5] release/2024-10-11: Hotfix Signed-off-by: Dave Richer --- server/email/tasksEmails.js | 2 ++ server/email/tasksEmailsQueue.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index 189471e5a..ff20af151 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -29,10 +29,12 @@ if (process.env.NODE_ENV !== "development") { // Handling SIGINT (e.g., Ctrl+C) process.on("SIGINT", async () => { await tasksEmailQueueCleanup(); + process.exit(0); }); // Handling SIGTERM (e.g., sent by system shutdown) process.on("SIGTERM", async () => { await tasksEmailQueueCleanup(); + process.exit(0); }); // Handling uncaught exceptions process.on("uncaughtException", async (err) => { diff --git a/server/email/tasksEmailsQueue.js b/server/email/tasksEmailsQueue.js index b01c9aa14..dc004abc1 100644 --- a/server/email/tasksEmailsQueue.js +++ b/server/email/tasksEmailsQueue.js @@ -13,7 +13,7 @@ const taskEmailQueue = () => console.log("Processing reminds for taskIds: ", taskIds.join(", ")); // Set the remind_at_sent to the current time. - const now = moment.utc().toISOString(); + const now = moment().toISOString(); client .request(UPDATE_TASKS_REMIND_AT_SENT, { taskIds, now }) From 05cc4dd18894100ab2f1a2609b2f9bacaae6cfca Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Sat, 12 Oct 2024 12:26:30 -0400 Subject: [PATCH 4/5] release/2024-10-11: Hotfix Signed-off-by: Dave Richer --- server/email/tasksEmails.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index ff20af151..94deb2be2 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -39,12 +39,12 @@ if (process.env.NODE_ENV !== "development") { // Handling uncaught exceptions process.on("uncaughtException", async (err) => { await tasksEmailQueueCleanup(); - throw err; + process.exit(1); }); // Handling unhandled promise rejections process.on("unhandledRejection", async (reason, promise) => { await tasksEmailQueueCleanup(); - throw reason; + process.exit(1); }); } From 23467280b4fa60431a90f9aa088f21d6c0add400 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 16 Oct 2024 13:18:48 -0400 Subject: [PATCH 5/5] release/2024-10-11: Remove Task Emails Cleanup Signed-off-by: Dave Richer --- server/email/tasksEmails.js | 48 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index 94deb2be2..c8aebaa64 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -25,28 +25,32 @@ const tasksEmailQueueCleanup = async () => { } }; -if (process.env.NODE_ENV !== "development") { - // Handling SIGINT (e.g., Ctrl+C) - process.on("SIGINT", async () => { - await tasksEmailQueueCleanup(); - process.exit(0); - }); - // Handling SIGTERM (e.g., sent by system shutdown) - process.on("SIGTERM", async () => { - await tasksEmailQueueCleanup(); - process.exit(0); - }); - // Handling uncaught exceptions - process.on("uncaughtException", async (err) => { - await tasksEmailQueueCleanup(); - process.exit(1); - }); - // Handling unhandled promise rejections - process.on("unhandledRejection", async (reason, promise) => { - await tasksEmailQueueCleanup(); - process.exit(1); - }); -} +// if (process.env.NODE_ENV !== "development") { +// // Handling SIGINT (e.g., Ctrl+C) +// process.on("SIGINT", async () => { +// console.log("Handling SIGNIT For Tasks Cleanup"); +// await tasksEmailQueueCleanup(); +// process.exit(0); +// }); +// // Handling SIGTERM (e.g., sent by system shutdown) +// process.on("SIGTERM", async () => { +// console.log("Handling SIGTERM For Tasks Cleanup"); +// await tasksEmailQueueCleanup(); +// process.exit(0); +// }); +// // Handling uncaught exceptions +// process.on("uncaughtException", async (err) => { +// console.log("Handling uncaughtException For Tasks Cleanup"); +// await tasksEmailQueueCleanup(); +// 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.