use nginx as default aiohttp server

Author: Reskov

frameworks/Python/aiohttp/README.md

@@ -35,7 +35,7 @@ This will switch which database engine the app uses to execute queries with test
 
 ### Server
 
-gunicorn+uvloop on CPython
+nginx+uvloop on CPython
 
 ## Test URLs
 

frameworks/Python/aiohttp/aiohttp-gunicorn.dockerfile

@@ -0,0 +1,14 @@
+FROM python:3.13
+
+ADD ./ /aiohttp
+
+WORKDIR aiohttp
+
+RUN pip3 install cython==3.0.11 && \
+    pip3 install -r /aiohttp/requirements.txt
+
+ENV CONNECTION=RAW
+
+EXPOSE 8080
+
+CMD python3 -O -m gunicorn app.gunicorn:app -c gunicorn_conf.py

frameworks/Python/aiohttp/aiohttp-nginx.dockerfile

@@ -1,12 +1,22 @@
 FROM python:3.13
 
-ADD ./ /aiohttp
+RUN apt-get update && apt-get install -y nginx
 
-WORKDIR aiohttp
+ADD ./requirements.txt /aiohttp/requirements.txt
 
 RUN pip3 install cython==3.0.11 && \
     pip3 install -r /aiohttp/requirements.txt
 
+ADD ./ /aiohttp
+
+WORKDIR /aiohttp
+
+ENV CONNECTION=ORM
+
 EXPOSE 8080
 
-CMD python3 -O -m gunicorn app.gunicorn:app -c gunicorn_conf.py
+RUN chmod +x /aiohttp/nginx-entrypoint.sh
+
+ENTRYPOINT ["/aiohttp/nginx-entrypoint.sh"]
+
+

frameworks/Python/aiohttp/aiohttp-orm.dockerfile

@@ -1,14 +1,20 @@
 FROM python:3.13
 
-ADD ./ /aiohttp
+RUN apt-get update && apt-get install -y nginx
 
-WORKDIR aiohttp
+ADD ./requirements.txt /aiohttp/requirements.txt
 
 RUN pip3 install cython==3.0.11 && \
     pip3 install -r /aiohttp/requirements.txt
 
+ADD ./ /aiohttp
+
+WORKDIR /aiohttp
+
 ENV CONNECTION=RAW
 
 EXPOSE 8080
 
-CMD python3 -O -m gunicorn app.gunicorn:app -c gunicorn_conf.py
+RUN chmod +x /aiohttp/nginx-entrypoint.sh
+
+ENTRYPOINT ["/aiohttp/nginx-entrypoint.sh"]

frameworks/Python/aiohttp/aiohttp.dockerfile

@@ -17,13 +17,13 @@
       "flavor": "Python3",
       "orm": "Raw",
       "platform": "asyncio",
-      "webserver": "gunicorn",
+      "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "aiohttp",
       "notes": "uses asyncpg for database access"
     },
-    "nginx": {
+    "gunicorn": {
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries/",
@@ -42,8 +42,8 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aiohttp-nginx",
-      "notes": "uses nginx as proxy server",
+      "display_name": "aiohttp-gunicorn",
+      "notes": "uses gunicorn as proxy server",
       "versus": "default"
     },
     "orm": {
@@ -60,7 +60,7 @@
       "flavor": "Python3",
       "orm": "Full",
       "platform": "asyncio",
-      "webserver": "gunicorn",
+      "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "aiohttp-orm",

frameworks/Python/aiohttp/benchmark_config.json

@@ -15,10 +15,10 @@ database_os = "Linux"
 os = "Linux"
 orm = "Raw"
 platform = "asyncio"
-webserver = "gunicorn"
+webserver = "nginx"
 versus = "None"
 
-[nginx]
+[gunicorn]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
@@ -32,8 +32,8 @@ database_os = "Linux"
 os = "Linux"
 orm = "Raw"
 platform = "asyncio"
-webserver = "nginx"
-versus = "None"
+webserver = "gunicorn"
+versus = "default"
 
 [orm]
 urls.db = "/db"
@@ -47,5 +47,5 @@ database_os = "Linux"
 os = "Linux"
 orm = "Full"
 platform = "asyncio"
-webserver = "gunicorn"
+webserver = "nginx"
 versus = "default"

frameworks/Python/aiohttp/config.toml

@@ -14,7 +14,7 @@ for i in $(seq 0 $((CORES-1))); do
   SOCKET="/run/aiohttp-$i.sock"
   until [ -S "$SOCKET" ]; do
     echo "Waiting for socket $SOCKET..."
-    sleep 0.1
+    sleep 0.2
   done
   chown root:www-data "$SOCKET"
   chmod 660 "$SOCKET"