Provide more info in log context, ideally we could just pass client/upstream/request/response objects but for now passing dict is ok

Author: abhinavsingh

README.md

@@ -1,5 +1,9 @@
 [![Proxy.Py](https://github.com/raw/abhinavsingh/proxy.py/develop/ProxyPy.png)](https://github.com/abhinavsingh/proxy.py)
 
+<p style="text-align: center;">
+⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • 😈 TLS interception • 🔒 DNS-over-HTTPS • 🔥 Poor Man's VPN • ⏪ Reverse & ⏩ Forward • 👮🏿 "Proxy Server" framework • 🌐 "Web Server" framework • ➵ ➶ ➷ ➠ "PubSub" framework • 👷 "Work" acceptor & executor framework
+</p>
+
 [![PyPi Monthly](https://img.shields.io/pypi/dm/proxy.py?style=for-the-badge&color=darkgreen)](https://pypi.org/project/proxy.py/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/abhinavsingh/proxy.py?style=for-the-badge&color=darkgreen)](https://hub.docker.com/r/abhinavsingh/proxy.py)
 [![No Dependencies](https://img.shields.io/static/v1?label=dependencies&message=0&style=for-the-badge&color=darkgreen)](https://github.com/abhinavsingh/proxy.py)

proxy/common/flag.py

@@ -122,7 +122,7 @@ def initialize(
             sys.exit(1)
 
         # Setup logging module
-        Logger.setup_logger(args.log_file, args.log_level, args.log_format)
+        Logger.setup(args.log_file, args.log_level, args.log_format)
 
         # Setup limits
         set_open_file_limit(args.open_file_limit)

proxy/common/logger.py

@@ -10,7 +10,7 @@
 """
 import logging
 
-from typing import Optional
+from typing import Optional, Union
 
 from .constants import DEFAULT_LOG_FILE, DEFAULT_LOG_FORMAT, DEFAULT_LOG_LEVEL
 
@@ -23,22 +23,28 @@
 }
 
 
+def single_char_to_level(char: str) -> str:
+    return getattr(logging, SINGLE_CHAR_TO_LEVEL[char.upper()[0]])
+
+
 class Logger:
     """Common logging utilities and setup."""
 
     @staticmethod
-    def setup_logger(
+    def setup(
             log_file: Optional[str] = DEFAULT_LOG_FILE,
             log_level: str = DEFAULT_LOG_LEVEL,
             log_format: str = DEFAULT_LOG_FORMAT,
     ) -> None:
-        ll = getattr(logging, SINGLE_CHAR_TO_LEVEL[log_level.upper()[0]])
         if log_file:
             logging.basicConfig(
                 filename=log_file,
                 filemode='a',
-                level=ll,
+                level=single_char_to_level(log_level),
                 format=log_format,
             )
         else:
-            logging.basicConfig(level=ll, format=log_format)
+            logging.basicConfig(
+                level=single_char_to_level(log_level),
+                format=log_format,
+            )

proxy/core/acceptor/acceptor.py

@@ -96,7 +96,7 @@ def run_once(self) -> None:
         self._work(conn, addr)
 
     def run(self) -> None:
-        Logger.setup_logger(
+        Logger.setup(
             self.flags.log_file, self.flags.log_level,
             self.flags.log_format,
         )

proxy/core/acceptor/threadless.py

@@ -202,7 +202,7 @@ def run_once(self) -> None:
         self.cleanup_inactive()
 
     def run(self) -> None:
-        Logger.setup_logger(
+        Logger.setup(
             self.flags.log_file, self.flags.log_level,
             self.flags.log_format,
         )

proxy/http/proxy/server.py

@@ -322,12 +322,21 @@ def on_client_connection_close(self) -> None:
         context = {
             'client_ip': None if not self.client.addr else self.client.addr[0],
             'client_port': None if not self.client.addr else self.client.addr[1],
-            'request_method': text_(self.request.method),
-            'request_path': text_(self.request.path),
             'server_host': text_(self.upstream.addr[0] if self.upstream else None),
             'server_port': text_(self.upstream.addr[1] if self.upstream else None),
-            'response_bytes': self.response.total_size,
             'connection_time_ms': '%.2f' % ((time.time() - self.start_time) * 1000),
+            # Request
+            'request_method': text_(self.request.method),
+            'request_path': text_(self.request.path),
+            'request_bytes': self.request.total_size,
+            'request_code': self.request.code,
+            'request_ua': self.request.header(b'user-agent')
+            if self.request.has_header(b'user-agent')
+            else None,
+            'request_reason': self.request.reason,
+            'request_version': self.request.version,
+            # Response
+            'response_bytes': self.response.total_size,
             'response_code': text_(self.response.code),
             'response_reason': text_(self.response.reason),
         }