Upgraded modules, added commit id to build process

src/main.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 import signal
 from contextlib import asynccontextmanager
 
@@ -13,7 +14,6 @@ from metrics_server import REQUEST_COUNTER
 from rabbitmq_handler import RabbitMQConsumer
 from secret_manager import cleanup_secret_files
 from simple_logger_handler import LOG_LEVEL, setup_logger
-from uvicorn_logger_config import LOGGING_CONFIG
 
 logger = setup_logger(__name__)
 MAX_MESSAGES = 100
@@ -120,8 +120,10 @@ class QuietServer(uvicorn.Server):
 		pass
 
 async def start_servers():
-	config_main = uvicorn.Config(api, host="0.0.0.0", port=8101, log_level=LOG_LEVEL.lower(), log_config=LOGGING_CONFIG)
-	config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(), log_config=LOGGING_CONFIG)
+	logger.info("[Server] Starting main API (port 8101) and metrics server (port 9000)...")
+	logger.info(f"[Server] Build commit id={os.getenv("COMMIT_ID","unknown")}")
+	config_main = uvicorn.Config(api, host="0.0.0.0", port=8101, log_level=LOG_LEVEL.lower(), log_config=None)
+	config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(), log_config=None)
 	servers = [QuietServer(config_main), QuietServer(config_metrics)]
 
 	def stop():

src/rabbitmq_handler.py

@@ -7,7 +7,7 @@ from urllib.parse import quote
 import aio_pika
 from aio_pika.exceptions import AMQPException
 
-from secret_manager import return_credentials
+from secret_manager import get_secret
 from simple_logger_handler import setup_logger
 
 logger = setup_logger(__name__)
@@ -40,8 +40,8 @@ class RabbitMQConsumer:
 		return lock
 
 	async def connect(self):
-		username = return_credentials("/etc/secrets/rmq_username")
-		password = return_credentials("/etc/secrets/rmq_password")
+		username = get_secret(os.getenv("RMQ_USERNAME",""),"/etc/secrets/rmq_username")
+		password = get_secret(os.getenv("RMQ_PASSWORD",""),"/etc/secrets/rmq_password")
 		url = (
 			f"amqp://{quote(username, safe='')}:{quote(password, safe='')}"
 			f"@{self.rmq_host}/{quote(self.rmq_vhost, safe='')}"