Commit
·
728cbca
1
Parent(s):
0fe181b
config.py
CHANGED
|
@@ -53,7 +53,7 @@ def _build_amqp_url(local: dict):
|
|
| 53 |
@lru_cache
|
| 54 |
def get_settings() -> Settings:
|
| 55 |
cfg = _load_json(APPSETTINGS_PATH)
|
| 56 |
-
cfg = _replace_env_vars(cfg)
|
| 57 |
|
| 58 |
# Flatten relevant LocalSystemUrl fields
|
| 59 |
local = cfg.get("LocalSystemUrl", {})
|
|
@@ -62,17 +62,17 @@ def get_settings() -> Settings:
|
|
| 62 |
cfg["RABBIT_HOST_NAME"] = local.get("RabbitHostName")
|
| 63 |
cfg["RABBIT_PORT"] = local.get("RabbitPort")
|
| 64 |
cfg["RABBIT_USER_NAME"] = local.get("RabbitUserName")
|
| 65 |
-
cfg["RABBIT_PASSWORD"] = local.get("RabbitPassword")
|
| 66 |
cfg["RABBIT_VHOST"] = local.get("RabbitVHost")
|
| 67 |
cfg["RABBIT_USE_TLS"] = local.get("UseTls")
|
| 68 |
|
| 69 |
-
# Map JSON keys to
|
| 70 |
cfg["SERVICE_ID"] = cfg.get("ServiceID")
|
| 71 |
cfg["RABBIT_ROUTING_KEY"] = cfg.get("RabbitRoutingKey")
|
| 72 |
cfg["RABBIT_EXCHANGE_TYPE"] = cfg.get("RabbitExhangeType") or "topic"
|
| 73 |
cfg["REDIS_URL"] = cfg.get("RedisUrl")
|
| 74 |
cfg["REDIS_SECRET"] = cfg.get("RedisSecret")
|
| 75 |
-
cfg["EXCHANGE_TYPES"] = cfg.get("EXCHANGE_TYPES", {})
|
| 76 |
cfg["RABBIT_PREFETCH"] = cfg.get("RABBIT_PREFETCH", 1)
|
| 77 |
|
| 78 |
# Build AMQP_URL if not already provided
|
|
|
|
| 53 |
@lru_cache
|
| 54 |
def get_settings() -> Settings:
|
| 55 |
cfg = _load_json(APPSETTINGS_PATH)
|
| 56 |
+
cfg = _replace_env_vars(cfg) # <- replaces .env everywhere first
|
| 57 |
|
| 58 |
# Flatten relevant LocalSystemUrl fields
|
| 59 |
local = cfg.get("LocalSystemUrl", {})
|
|
|
|
| 62 |
cfg["RABBIT_HOST_NAME"] = local.get("RabbitHostName")
|
| 63 |
cfg["RABBIT_PORT"] = local.get("RabbitPort")
|
| 64 |
cfg["RABBIT_USER_NAME"] = local.get("RabbitUserName")
|
| 65 |
+
cfg["RABBIT_PASSWORD"] = local.get("RabbitPassword") # already resolved
|
| 66 |
cfg["RABBIT_VHOST"] = local.get("RabbitVHost")
|
| 67 |
cfg["RABBIT_USE_TLS"] = local.get("UseTls")
|
| 68 |
|
| 69 |
+
# Map JSON keys to Python attributes
|
| 70 |
cfg["SERVICE_ID"] = cfg.get("ServiceID")
|
| 71 |
cfg["RABBIT_ROUTING_KEY"] = cfg.get("RabbitRoutingKey")
|
| 72 |
cfg["RABBIT_EXCHANGE_TYPE"] = cfg.get("RabbitExhangeType") or "topic"
|
| 73 |
cfg["REDIS_URL"] = cfg.get("RedisUrl")
|
| 74 |
cfg["REDIS_SECRET"] = cfg.get("RedisSecret")
|
| 75 |
+
cfg["EXCHANGE_TYPES"] = cfg.get("EXCHANGE_TYPES", {})
|
| 76 |
cfg["RABBIT_PREFETCH"] = cfg.get("RABBIT_PREFETCH", 1)
|
| 77 |
|
| 78 |
# Build AMQP_URL if not already provided
|