diff --git a/src/analytics/backend/service/__main__.py b/src/analytics/backend/service/__main__.py index 371b5a7cadc5c42ea75262323becf3692028bf36..3c4c36b7c7bd952164bf9e48a45e22fb00575564 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 3fa2ca8758ca54b2e7fa59df06ba0e144216ed84..6c331844f45d98095ef98951f3db43a0e2f0c69c 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__':