Use --local-executor flag by default for Docker container (#880)

* Benchmark gets packaged within wheel if set as a package

* Use `--local-executor` flag by default for Docker containers

* Dockerfile update

* Fix mypy issues

* Remove conflicting dir names

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: abhinavsingh

Dockerfile

@@ -26,4 +26,7 @@ RUN apk update && apk add openssl
 
 EXPOSE 8899/tcp
 ENTRYPOINT [ "proxy" ]
-CMD [ "--hostname=0.0.0.0" ]
+CMD [ \
+  "--hostname=0.0.0.0" \
+  "--local-executor" \
+  ]

benchmark/__init__.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+"""
+    proxy.py
+    ~~~~~~~~
+    ⚡⚡⚡ Fast, Lightweight, Pluggable, TLS interception capable proxy server focused on
+    Network monitoring, controls & Application development, testing, debugging.
+
+    :copyright: (c) 2013-present by Abhinav Singh and contributors.
+    :license: BSD, see LICENSE for more details.
+"""
+import time
+import ipaddress
+import proxy
+
+
+if __name__ == '__main__':
+    with proxy.Proxy(
+            ['--plugin', 'proxy.plugin.WebServerPlugin'],
+            hostname=ipaddress.ip_address('127.0.0.1'),
+            port=8899,
+            backlog=65536,
+            open_file_limit=65536,
+            enable_web_server=True,
+            disable_proxy_server=False,
+            num_acceptors=10,
+            local_executor=True,
+            log_file='/dev/null',
+    ) as _:
+        while True:
+            try:
+                time.sleep(1)
+            except KeyboardInterrupt:
+                break

benchmark/aiohttp/server.py renamed to benchmark/_aiohttp.py

@@ -61,7 +61,7 @@ run_benchmark() {
 }
 
 benchmark_lib() {
-  python ./benchmark/$1/server.py > /dev/null 2>&1 &
+  python ./benchmark/_$1.py > /dev/null 2>&1 &
   local SERVER_PID=$!
   echo "Server (pid:$SERVER_PID) running"
   sleep 1
@@ -75,31 +75,6 @@ benchmark_lib() {
   fi
 }
 
-benchmark_proxy_py() {
-  python -m proxy \
-    --hostname 127.0.0.1 \
-    --port $1 \
-    --backlog 65536 \
-    --open-file-limit 65536 \
-    --enable-web-server \
-    --plugin proxy.plugin.WebServerPlugin \
-    --disable-http-proxy \
-    --num-acceptors 10 \
-    --local-executor \
-    --log-file /dev/null > /dev/null 2>&1 &
-  local SERVER_PID=$!
-  echo "Server (pid:$SERVER_PID) running"
-  sleep 1
-  run_benchmark $1
-  kill -15 $SERVER_PID
-  sleep 1
-  kill -0 $SERVER_PID > /dev/null 2>&1
-  local RUNNING=$?
-  if [ "$RUNNING" == "1" ]; then
-    echo "Server gracefully shutdown"
-  fi
-}
-
 benchmark_asgi() {
   uvicorn \
     --port $1 \
@@ -120,7 +95,7 @@ benchmark_asgi() {
 
 # echo "============================="
 # echo "Benchmarking Proxy.Py"
-# benchmark_proxy_py $PROXYPY_PORT
+# PYTHONPATH=. benchmark_lib proxy $PROXYPY_PORT
 # echo "============================="
 
 # echo "============================="