From 08b15bed236bb4b9ffa9a5ba9e08074a22a20c5b Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 13 Sep 2024 16:28:18 +0000
Subject: [PATCH] Analytics: fixed main.py
---
src/analytics/backend/service/__main__.py | 17 +++++++++++------
src/analytics/frontend/service/__main__.py | 5 ++---
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/analytics/backend/service/__main__.py b/src/analytics/backend/service/__main__.py
index 371b5a7ca..3c4c36b7c 100644
--- a/src/analytics/backend/service/__main__.py
+++ b/src/analytics/backend/service/__main__.py
@@ -13,8 +13,9 @@
# limitations under the License.
import logging, signal, sys, threading
-from common.Settings import get_log_level
-from analytics.backend.service.AnalyticsBackendService import AnalyticsBackendService
+from prometheus_client import start_http_server
+from common.Settings import get_log_level, get_metrics_port
+from .AnalyticsBackendService import AnalyticsBackendService
terminate = threading.Event()
LOGGER = None
@@ -27,13 +28,17 @@ def main():
global LOGGER # pylint: disable=global-statement
log_level = get_log_level()
- logging.basicConfig(level=log_level)
+ logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s")
LOGGER = logging.getLogger(__name__)
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
- LOGGER.debug('Starting...')
+ LOGGER.info('Starting...')
+
+ # Start metrics server
+ metrics_port = get_metrics_port()
+ start_http_server(metrics_port)
grpc_service = AnalyticsBackendService()
grpc_service.start()
@@ -41,10 +46,10 @@ def main():
# Wait for Ctrl+C or termination signal
while not terminate.wait(timeout=1.0): pass
- LOGGER.debug('Terminating...')
+ LOGGER.info('Terminating...')
grpc_service.stop()
- LOGGER.debug('Bye')
+ LOGGER.info('Bye')
return 0
if __name__ == '__main__':
diff --git a/src/analytics/frontend/service/__main__.py b/src/analytics/frontend/service/__main__.py
index 3fa2ca875..6c331844f 100644
--- a/src/analytics/frontend/service/__main__.py
+++ b/src/analytics/frontend/service/__main__.py
@@ -17,7 +17,6 @@ from prometheus_client import start_http_server
from common.Settings import get_log_level, get_metrics_port
from .AnalyticsFrontendService import AnalyticsFrontendService
-
terminate = threading.Event()
LOGGER = None
@@ -47,10 +46,10 @@ def main():
# Wait for Ctrl+C or termination signal
while not terminate.wait(timeout=1.0): pass
- LOGGER.debug('Terminating...')
+ LOGGER.info('Terminating...')
grpc_service.stop()
- LOGGER.debug('Bye')
+ LOGGER.info('Bye')
return 0
if __name__ == '__main__':
--
GitLab