From b6edfbb9a12e1e77d71d923146c69a24f932da90 Mon Sep 17 00:00:00 2001
From: Ben Forshey <benjamin.a.forshey@nasa.gov>
Date: Wed, 24 Jan 2024 10:45:04 -0500
Subject: [PATCH 1/2] fix: proxy changes for Amos to bugfix

---
 .env.example                |  3 +--
 docker-compose.override.yml |  1 +
 packages/app/lib/nats.ts    | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index 5ba4ce992..779921c23 100644
--- a/.env.example
+++ b/.env.example
@@ -8,8 +8,7 @@ AUTH_HOST=urs.earthdata.nasa.gov
 AUTH_CLIENT_ID=ask-someone-for-this
 AUTH_CLIENT_SECRET=ask-someone-for-this
 
-MAIL_HOST=mailhost.gsfc.nasa.gov
-
+MAIL_HOST=ndc-relay.ndc.nasa.gov
 # Uncomment if you are planning to use Cognito for login
 # follow the steps for creating a client at: https://www.npmjs.com/package/passport-cognito-oauth2
 #COGNITO_CLIENT_DOMAIN=theCognitoClientDomain
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 6c478927b..65da6b91a 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -29,6 +29,7 @@ services:
   app:
     container_name: meditor_app
     build: packages/app
+    restart: on-failure:3
     env_file:
       - .env
     ports:
diff --git a/packages/app/lib/nats.ts b/packages/app/lib/nats.ts
index 5bb103d7c..4e5a15d98 100644
--- a/packages/app/lib/nats.ts
+++ b/packages/app/lib/nats.ts
@@ -24,7 +24,7 @@ function connectToNats() {
     return {
         stan,
         // also returning a promise that resolves when NATS connects
-        stanConnectPromise: new Promise<Stan>(resolve => {
+        stanConnectPromise: new Promise<Stan>((resolve, reject) => {
             // wait for the connection to complete
             stan.on('connect', () => {
                 log.info('Connected to NATS')
@@ -33,6 +33,14 @@ function connectToNats() {
 
             stan.on('error', (error: any) => {
                 log.error(error) //? do anything beyond logging?
+
+                if (stan) {
+                    log.info('Stan is being resolved...', JSON.stringify(stan))
+
+                    resolve(stan)
+                } else {
+                    process?.exit()
+                }
             })
         }),
     }

From 36b45564a2a0b939f94777bbfdec0ac7ee4e62a7 Mon Sep 17 00:00:00 2001
From: Ben Forshey <benjamin.a.forshey@nasa.gov>
Date: Tue, 30 Jan 2024 15:13:12 -0500
Subject: [PATCH 2/2] fix: adjust for feedback

---
 docker-compose.override.yml | 2 +-
 packages/app/lib/nats.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 65da6b91a..abc032fe0 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -29,7 +29,7 @@ services:
   app:
     container_name: meditor_app
     build: packages/app
-    restart: on-failure:3
+    restart: on-failure
     env_file:
       - .env
     ports:
diff --git a/packages/app/lib/nats.ts b/packages/app/lib/nats.ts
index 4e5a15d98..9302ecdcd 100644
--- a/packages/app/lib/nats.ts
+++ b/packages/app/lib/nats.ts
@@ -35,7 +35,7 @@ function connectToNats() {
                 log.error(error) //? do anything beyond logging?
 
                 if (stan) {
-                    log.info('Stan is being resolved...', JSON.stringify(stan))
+                    log.debug('Stan is being resolved...', JSON.stringify(stan))
 
                     resolve(stan)
                 } else {