Merge c68bace into 3bedcdf

release-engineering · Mar 25, 2022 · 30ab956 · 30ab956
2 parents 3bedcdf + c68bace
commit 30ab956
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/configuration/lambda_config.template b/configuration/lambda_config.template
@@ -1,12 +1,12 @@
 {
   "table": {
-    "name": "$PROJECT-cdn-$ENV_TYPE",
+    "name": "$EXODUS_TABLE",
     "available_regions": [
       "us-east-1"
     ]
   },
   "config_table": {
-    "name": "$PROJECT-config-$ENV_TYPE",
+    "name": "$EXODUS_CONFIG_TABLE",
     "available_regions": [
       "us-east-1"
     ]
@@ -24,7 +24,7 @@
     "disable_existing_loggers": "False",
     "formatters": {
       "default": {
-        "format": "%(asctime)s - %(levelname)s - %(aws_request_id)s - %(message)s\n",
+        "format": "$EXODUS_LOG_FORMAT",
         "datefmt": "%Y-%m-%d %H:%M:%S"
       }
     },

diff --git a/scripts/mk-config b/scripts/mk-config
@@ -3,11 +3,14 @@ set -e
 
 export ORIGIN_RESPONSE_LOGGER_LEVEL=${ORIGIN_RESPONSE_LOGGER_LEVEL:-WARNING}
 export ORIGIN_REQUEST_LOGGER_LEVEL=${ORIGIN_REQUEST_LOGGER_LEVEL:-WARNING}
+export EXODUS_LOG_FORMAT="${EXODUS_LOG_FORMAT:-%(asctime)s - %(levelname)s - %(aws_request_id)s - %(message)s}"
 export EXODUS_HEADERS_MAX_AGE=${EXODUS_HEADERS_MAX_AGE:-600}
 export EXODUS_CONFIG_CACHE_TTL=${EXODUS_CONFIG_CACHE_TTL:-2}
 export EXODUS_COOKIE_TTL=${EXODUS_COOKIE_TTL:-720}
 export PROJECT=${PROJECT:-exodus}
 export ENV_TYPE=${ENV_TYPE:-dev}
+export EXODUS_TABLE=${EXODUS_TABLE:-$PROJECT-cdn-$ENV_TYPE}
+export EXODUS_CONFIG_TABLE=${EXODUS_CONFIG_TABLE:-$PROJECT-config-$ENV_TYPE}
 export EXODUS_SECRET_ARN=${EXODUS_SECRET_ARN}
 export EXODUS_KEY_ID=${EXODUS_KEY_ID}