From 4e2c7f64832050a09431a6b19d8609b41663f395 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Sat, 8 Aug 2020 13:06:22 -0400 Subject: [PATCH] Update http monitor logging format --- .../monitoring-daemon-asyncio/README.rst | 36 ++++++++++++++----- .../monitoringdaemon/monitors.py | 6 +++- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/examples/miniapps/monitoring-daemon-asyncio/README.rst b/examples/miniapps/monitoring-daemon-asyncio/README.rst index 7dbe27ab..c9432dab 100644 --- a/examples/miniapps/monitoring-daemon-asyncio/README.rst +++ b/examples/miniapps/monitoring-daemon-asyncio/README.rst @@ -25,11 +25,31 @@ The output should be something like: Starting monitoring-daemon-asyncio_monitor_1 ... done Attaching to monitoring-daemon-asyncio_monitor_1 - monitor_1 | [2020-08-08 02:48:24,906] [INFO] [Dispatcher]: Starting up - monitor_1 | [2020-08-08 02:48:24,980] [INFO] [HttpMonitor]: GET http://example.com, response code: 200, content length: 648, request took: 0.072 seconds - monitor_1 | [2020-08-08 02:48:25,042] [INFO] [HttpMonitor]: GET https://httpbin.org/get, response code: 200, content length: 310, request took: 0.134 seconds - monitor_1 | [2020-08-08 02:48:29,991] [INFO] [HttpMonitor]: GET http://example.com, response code: 200, content length: 648, request took: 0.074 seconds - monitor_1 | [2020-08-08 02:48:30,037] [INFO] [HttpMonitor]: GET https://httpbin.org/get, response code: 200, content length: 310, request took: 0.119 seconds + monitor_1 | [2020-08-08 17:04:36,655] [INFO] [Dispatcher]: Starting up + monitor_1 | [2020-08-08 17:04:36,732] [INFO] [HttpMonitor]: Check + monitor_1 | GET http://example.com + monitor_1 | response code: 200 + monitor_1 | content length: 648 + monitor_1 | request took: 0.074 seconds + monitor_1 | + monitor_1 | [2020-08-08 17:04:36,811] [INFO] [HttpMonitor]: Check + monitor_1 | GET https://httpbin.org/get + monitor_1 | response code: 200 + monitor_1 | content length: 310 + monitor_1 | request took: 0.153 seconds + monitor_1 | + monitor_1 | [2020-08-08 17:04:41,731] [INFO] [HttpMonitor]: Check + monitor_1 | GET http://example.com + monitor_1 | response code: 200 + monitor_1 | content length: 648 + monitor_1 | request took: 0.067 seconds + monitor_1 | + monitor_1 | [2020-08-08 17:04:41,787] [INFO] [HttpMonitor]: Check + monitor_1 | GET https://httpbin.org/get + monitor_1 | response code: 200 + monitor_1 | content length: 310 + monitor_1 | request took: 0.122 seconds + monitor_1 | Test ---- @@ -59,9 +79,9 @@ The output should be something like: monitoringdaemon/__init__.py 0 0 100% monitoringdaemon/__main__.py 9 9 0% monitoringdaemon/containers.py 11 0 100% - monitoringdaemon/dispatcher.py 45 5 89% + monitoringdaemon/dispatcher.py 43 5 88% monitoringdaemon/http.py 6 3 50% - monitoringdaemon/monitors.py 29 2 93% + monitoringdaemon/monitors.py 23 1 96% monitoringdaemon/tests.py 37 0 100% ---------------------------------------------------- - TOTAL 137 19 86% + TOTAL 129 18 86% diff --git a/examples/miniapps/monitoring-daemon-asyncio/monitoringdaemon/monitors.py b/examples/miniapps/monitoring-daemon-asyncio/monitoringdaemon/monitors.py index d95007f0..ebcc8d0a 100644 --- a/examples/miniapps/monitoring-daemon-asyncio/monitoringdaemon/monitors.py +++ b/examples/miniapps/monitoring-daemon-asyncio/monitoringdaemon/monitors.py @@ -43,7 +43,11 @@ class HttpMonitor(Monitor): time_took = time_end - time_start self.logger.info( - '%s %s, response code: %s, content length: %s, request took: %s seconds', + 'Check\n' + ' %s %s\n' + ' response code: %s\n' + ' content length: %s\n' + ' request took: %s seconds\n', self._method, self._url, response.status,