From f56e4d65d89f7e215b63612b5fefce213f616a5f Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Nov 23 2020 17:05:24 +0000 Subject: [PATCH 1/3] Log requests in debug mode --- diff --git a/docker/greenwave-settings.py b/docker/greenwave-settings.py index 8ba9cfd..2ccb3ee 100644 --- a/docker/greenwave-settings.py +++ b/docker/greenwave-settings.py @@ -1,7 +1,7 @@ SECRET_KEY = 'greenwave' HOST = '0.0.0.0' PORT = 8080 -DEBUG = False +DEBUG = True POLICIES_DIR = '/etc/greenwave/policies/' WAIVERDB_API_URL = 'http://waiverdb:5004/api/v1.0' RESULTSDB_API_URL = 'http://resultsdb:5001/api/v2.0' diff --git a/greenwave/request_session.py b/greenwave/request_session.py index 44911d3..6cd823a 100644 --- a/greenwave/request_session.py +++ b/greenwave/request_session.py @@ -1,3 +1,5 @@ +import logging + import requests from json import dumps @@ -10,6 +12,8 @@ from flask import current_app, has_app_context from greenwave import __version__ +log = logging.getLogger(__name__) + class ErrorResponse(requests.Response): def __init__(self, status_code, error_message, url): @@ -26,6 +30,8 @@ class ErrorResponse(requests.Response): class RequestsSession(requests.Session): def request(self, *args, **kwargs): # pylint:disable=arguments-differ + log.debug('Request: args=%r, kwargs=%r', args, kwargs) + req_url = kwargs.get('url', args[1]) kwargs.setdefault('headers', {'Content-Type': 'application/json'}) @@ -34,11 +40,13 @@ class RequestsSession(requests.Session): kwargs.setdefault('verify', current_app.config['REQUESTS_VERIFY']) try: - return super().request(*args, **kwargs) + ret_val = super().request(*args, **kwargs) except (ConnectTimeout, RetryError) as e: ret_val = ErrorResponse(504, str(e), req_url) except (ConnectionError, ProxyError, SSLError) as e: ret_val = ErrorResponse(502, str(e), req_url) + + log.debug('Request finished: %r', ret_val) return ret_val From f69e66f70fed84dd0dcb34a0e42a99c054774461 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Nov 23 2020 18:02:59 +0000 Subject: [PATCH 2/3] Fix setting up logging before the first log --- diff --git a/greenwave/wsgi.py b/greenwave/wsgi.py index c89f466..2b75d0e 100644 --- a/greenwave/wsgi.py +++ b/greenwave/wsgi.py @@ -4,6 +4,6 @@ import logging from greenwave.logger import init_logging, log_to_stdout from greenwave.app_factory import create_app -app = create_app() init_logging() -log_to_stdout(level=logging.DEBUG if app.debug else logging.INFO) +log_to_stdout(logging.DEBUG) +app = create_app() From 31b28c13b0a4fc3ff9a3eac4cfdf1f91e101f2a7 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Nov 23 2020 18:02:59 +0000 Subject: [PATCH 3/3] Update memcached image for docker-compose --- diff --git a/docker-compose.yml b/docker-compose.yml index 218ae46..4e2de2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,7 @@ services: - waiverdb-db memcached: - image: "docker.io/modularitycontainers/memcached" + image: "quay.io/factory2/memcached" networks: default: