Pre-merge Cosmetic changes

src/telemetry/backend/service/__main__.py

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 import logging, signal, sys, threading
-from common.Settings import get_log_level
+from prometheus_client import start_http_server
+from common.Settings import get_log_level, get_metrics_port
 from .TelemetryBackendService import TelemetryBackendService
 
 terminate = threading.Event()
@@ -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 = TelemetryBackendService()
     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__':

src/telemetry/frontend/service/__main__.py

@@ -28,13 +28,13 @@ 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()
@@ -46,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__':