refactor: prioritize env vars over config file in AMQAdapter settings

Co-authored-by: aider (openrouter/openai/o3-mini-high) <aider@aider.chat>
This commit is contained in:
Stanislav Hejny
2025-07-12 10:45:10 +01:00
parent bd4272c30e
commit 5d8f07be3c
+27 -8
View File
@@ -50,18 +50,37 @@ class AMQAdapter:
self.swarm_task_id = os.getenv("SWARM_TASK_ID", default="python-adapter")
#
# Consul related configuration
self.consul_port = config.getint(
"CleverMicro-AMQ", self.PREFIX + "consul-port",
fallback=int(os.getenv("CONSUL_PORT"), 10) if os.getenv("CONSUL_PORT") is not None else 8500
self.consul_port = int(os.getenv(
"CONSUL_PORT",
config.get(
"CleverMicro-AMQ",
self.PREFIX + "consul-port",
fallback="8500"
)
self.consul_host = config.get(
)) if os.getenv("CONSUL_PORT") is not None else config.getint(
"CleverMicro-AMQ",
self.PREFIX + "consul-port",
fallback=8500
)
self.consul_host = os.getenv(
"CONSUL_HOST",
config.get(
"CleverMicro-AMQ",
self.PREFIX + "consul-host",
fallback="consul" if os.getenv("CONSUL_HOST") is None else os.getenv("CONSUL_HOST"),
fallback="consul"
)
self.consul_port = config.getint(
"CleverMicro-AMQ", self.PREFIX + "consul-max-retries",
fallback=int(os.getenv("CONSUL_MAX_RETRIES"), 10) if os.getenv("CONSUL_MAX_RETRIES") is not None else 5
)
self.consul_max_retries = int(os.getenv(
"CONSUL_MAX_RETRIES",
config.get(
"CleverMicro-AMQ",
self.PREFIX + "consul-max-retries",
fallback="5"
)
)) if os.getenv("CONSUL_MAX_RETRIES") is not None else config.getint(
"CleverMicro-AMQ",
self.PREFIX + "consul-max-retries",
fallback=5
)
self.consul_max_retries = config.getfloat(
"CleverMicro-AMQ", self.PREFIX + "consul-initial-retry-delay",