Merge pull request #4130 from hove-io/patch_all_variable_env

[Jormungandr] PATCH_WITH_GEVENT_SOCKET_ALL added

Author: azime

source/jormungandr/jormungandr/__init__.py

@@ -45,7 +45,7 @@
 
 # we want to patch gevent as early as possible
 if app.config.get(str('PATCH_WITH_GEVENT_SOCKET'), False):
-    init.patch_http()
+    init.patch_http(patch_level=app.config.get(str('PATCH_WITH_GEVENT_SOCKET_LEVEL'), "socket"))
 
 from jormungandr import new_relic
 

source/jormungandr/jormungandr/default_settings.py

@@ -312,6 +312,8 @@
 # These parameters are used to apply gevent's monkey patch
 # The Goal is to activate parallel calling valhalla, without the patch, parallel http and https calling may not work
 PATCH_WITH_GEVENT_SOCKET = bool(os.getenv('JORMUNGANDR_PATCH_WITH_GEVENT_SOCKET', True))
+# PATCH_WITH_GEVENT_SOCKET_LEVEL : values possibles all, thread or socket
+PATCH_WITH_GEVENT_SOCKET_LEVEL = os.getenv('JORMUNGANDR_PATCH_WITH_GEVENT_SOCKET_LEVEL', 'socket')
 
 GREENLET_POOL_SIZE = int(os.getenv('JORMUNGANDR_GEVENT_POOL_SIZE', 10))
 

source/jormungandr/jormungandr/init.py

@@ -54,16 +54,26 @@ def logger(app):
         app.logger.setLevel('INFO')
 
 
-def patch_http():
+def patch_http(patch_level="socket"):
     logger = logging.getLogger(__name__)
     logger.info(
         "Warning! You'are patching socket with gevent, parallel http/https calling by requests is activated"
     )
 
     from gevent import monkey
 
-    monkey.patch_ssl()
-    monkey.patch_socket()
+    logger.warning("patch_level : {}".format(patch_level))
+    if patch_level == "all":
+        monkey.patch_all()
+    elif patch_level == "thread":
+        monkey.patch_ssl()
+        monkey.patch_socket()
+        monkey.patch_thread()
+        monkey.patch_selectors()
+    else:
+        # Socket default value
+        monkey.patch_ssl()
+        monkey.patch_socket()
 
 
 def street_network_backends(app):