compress option for serve_static_file utility method (#1405)

* `compress` option for `serve_static_file` utility method

* Pin to `macos-12` for now

* Change default to `True` (old default behavior)

Author: abhinavsingh

.github/workflows/test-library.yml

@@ -439,7 +439,7 @@ jobs:
       # max-parallel: 4
       matrix:
         os:
-        - macOS-latest
+        - macOS-12
         - Ubuntu-20.04
         - Windows-latest
         python:
@@ -694,7 +694,7 @@ jobs:
     name: 📊 Node ${{ matrix.node }} @ ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-latest, macOS-latest]
+        os: [ubuntu-20.04, windows-latest, macOS-12]
         node: ['10.x', '11.x', '12.x']
       # max-parallel: 4
       fail-fast: false

proxy/common/constants.py

@@ -125,8 +125,11 @@ def _env_threadless_compliant() -> bool:
 DEFAULT_HTTPS_PROXY_ACCESS_LOG_FORMAT = '{client_ip}:{client_port} - ' + \
     '{request_method} {server_host}:{server_port} - ' + \
     '{response_bytes} bytes - {connection_time_ms}ms'
-DEFAULT_REVERSE_PROXY_ACCESS_LOG_FORMAT = '{client_ip}:{client_port} - ' + \
-    '{request_method} {request_path} -> {upstream_proxy_pass} - {connection_time_ms}ms'
+DEFAULT_REVERSE_PROXY_ACCESS_LOG_FORMAT = (
+    "{client_ip}:{client_port} - "
+    + "{request_method} {request_path} - {request_ua} -> "
+    + "{upstream_proxy_pass} - {connection_time_ms}ms"
+)
 DEFAULT_NUM_ACCEPTORS = 0
 DEFAULT_NUM_WORKERS = 0
 DEFAULT_OPEN_FILE_LIMIT = 1024

proxy/http/handler.py

@@ -181,7 +181,7 @@ def handle_data(self, data: memoryview) -> Optional[bool]:
             elif self.plugin:
                 self.plugin.on_client_data(data)
         except HttpProtocolException as e:
-            logger.info('HttpProtocolException: %s' % e)
+            logger.warning('HttpProtocolException: %s' % e)
             response: Optional[memoryview] = e.response(self.request)
             if response:
                 self.work.queue(response)
@@ -209,9 +209,10 @@ async def handle_writables(self, writables: Writables) -> bool:
                     'BrokenPipeError when flushing buffer for client',
                 )
                 return True
-            except OSError:
-                logger.warning(     # pragma: no cover
+            except OSError as exc:
+                logger.exception(  # pragma: no cover
                     'OSError when flushing buffer to client',
+                    exc_info=exc,
                 )
                 return True
         return False

proxy/http/server/plugin.py

@@ -47,7 +47,11 @@ def __init__(
         self.upstream_conn_pool = upstream_conn_pool
 
     @staticmethod
-    def serve_static_file(path: str, min_compression_length: int) -> memoryview:
+    def serve_static_file(
+        path: str,
+        min_compression_length: int,
+        compress: bool = True,
+    ) -> memoryview:
         try:
             with open(path, 'rb') as f:
                 content = f.read()
@@ -61,6 +65,7 @@ def serve_static_file(path: str, min_compression_length: int) -> memoryview:
             return okResponse(
                 content=content,
                 headers=headers,
+                compress=compress,
                 min_compression_length=min_compression_length,
                 # TODO: Should we really close or take advantage of keep-alive?
                 conn_close=True,