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:
@@ -50,18 +50,37 @@ class AMQAdapter:
|
|||||||
self.swarm_task_id = os.getenv("SWARM_TASK_ID", default="python-adapter")
|
self.swarm_task_id = os.getenv("SWARM_TASK_ID", default="python-adapter")
|
||||||
#
|
#
|
||||||
# Consul related configuration
|
# Consul related configuration
|
||||||
self.consul_port = config.getint(
|
self.consul_port = int(os.getenv(
|
||||||
"CleverMicro-AMQ", self.PREFIX + "consul-port",
|
"CONSUL_PORT",
|
||||||
fallback=int(os.getenv("CONSUL_PORT"), 10) if os.getenv("CONSUL_PORT") is not None else 8500
|
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",
|
"CleverMicro-AMQ",
|
||||||
self.PREFIX + "consul-host",
|
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",
|
self.consul_max_retries = int(os.getenv(
|
||||||
fallback=int(os.getenv("CONSUL_MAX_RETRIES"), 10) if os.getenv("CONSUL_MAX_RETRIES") is not None else 5
|
"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(
|
self.consul_max_retries = config.getfloat(
|
||||||
"CleverMicro-AMQ", self.PREFIX + "consul-initial-retry-delay",
|
"CleverMicro-AMQ", self.PREFIX + "consul-initial-retry-delay",
|
||||||
|
|||||||
Reference in New Issue
Block a user