Browse Source

[Python] Bump Granian to 1.5.x (#9157)

Giovanni Barillari 1 year ago
parent
commit
d54303b8cd

+ 1 - 1
frameworks/Python/emmett/requirements.txt

@@ -1,2 +1,2 @@
-emmett[orjson]>=2.5.3,<2.6.0
+emmett[orjson]>=2.5.12,<2.6.0
 psycopg2-binary==2.9.5

+ 4 - 3
frameworks/Python/emmett/run.py

@@ -4,16 +4,17 @@ from emmett.server import run
 
 
 if __name__ == "__main__":
-    cpus = multiprocessing.cpu_count()
+    workers = round(multiprocessing.cpu_count() / 2)
 
     run(
         "rsgi",
         ("app", "app"),
         host="0.0.0.0",
         port=8080,
-        workers=cpus,
+        workers=workers,
         backlog=16384,
-        threading_mode='runtime',
+        threading_mode="runtime",
+        http="1",
         enable_websockets=False,
         log_level="warn"
     )

+ 1 - 1
frameworks/Python/granian/requirements.txt

@@ -1,4 +1,4 @@
 asyncpg==0.29.0
-granian>=1.4.2,<1.5.0
+granian>=1.5.1,<1.6.0
 jinja2==3.1.4
 orjson==3.10.2

+ 9 - 4
frameworks/Python/granian/run.py

@@ -7,9 +7,14 @@ from granian import Granian
 if __name__ == '__main__':
     interface = sys.argv[1]
     threading_mode = sys.argv[2]
-    workers = multiprocessing.cpu_count()
-    if threading_mode == "workers":
-        workers = round(workers / 2)
+
+    #: split cores between the two loops
+    workers = round(multiprocessing.cpu_count() / 2)
+
+    blocking_threads = None
+    if interface == "wsgi":
+        #: we don't run any I/O in WSGI benches
+        blocking_threads = 1
 
     Granian(
         f"app_{interface}:main",
@@ -17,7 +22,7 @@ if __name__ == '__main__':
         port=8080,
         workers=workers,
         threading_mode=threading_mode,
-        blocking_threads=1,
+        blocking_threads=blocking_threads,
         backlog=16384,
         interface=interface,
         http="1",