From 754746f9f196a824b3f0ad547c5e6b8f5c666f4d Mon Sep 17 00:00:00 2001
From: Christian Kuhtz <christian@kuhtz.com>
Date: Tue, 16 Jul 2024 06:08:33 +0000
Subject: [PATCH] tweaks

---
 api/api.py                    |  3 ---
 api/tooling/check_env_vars.py | 13 ++++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/api/api.py b/api/api.py
index 92129f1..1017b3c 100644
--- a/api/api.py
+++ b/api/api.py
@@ -1,6 +1,5 @@
 # implement REST API using FastAPI
 
-import os
 import sys
 import logging
 from fastapi import FastAPI
@@ -34,8 +33,6 @@
 
     # check env and use defaults if not present
 
-    logger.info(os.environ())
-
     env = check_env_vars(logger=logger)
 
     # add REST routes
diff --git a/api/tooling/check_env_vars.py b/api/tooling/check_env_vars.py
index 3ab08bd..584e234 100644
--- a/api/tooling/check_env_vars.py
+++ b/api/tooling/check_env_vars.py
@@ -34,16 +34,15 @@ def check_env_vars(logger: Logger) -> Dict:
         'LOG_LEVEL': 'info'
     }
 
+    all_env_vars = dict(os.environ)
+
     env = {}
 
     for var in vars:
-        if var not in os.environ:
-            logger.info(f'{var} = \'{var_defaults[var]}\' (default)')
-            # The problematic exiting of fastapi/uvicorn/gunicorn and restart behavior means
-            # we will populate anything not specified in required with a sane default and leave it
-            # to the user to override if they have other ideas of what's sane.  Bailing is not an option.
+        if not all_env_vars[var]:
             env[var] = var_defaults[var]
+            logger.info(f'{var} = \'{env[var]}\' (default)')
         else:
-            logger.info(f'{var} = \'{os.environ(var)}\'')
-            env[var] = os.environ(var)
+            env[var] = all_env_vars[var]
+            logger.info(f'{var} = \'{env[var]}\'')
     return env