# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1696579368 -7200 # Fri Oct 06 10:02:48 2023 +0200 # Node ID 2ea8c9aee3cba53857d0c0cc65cde87976955378 # Parent 22c70e62e7e0de3f75b853e3812d2ba21dd049a8 🚑 Use correct gevent uri/option for Odoo 16+ diff --git a/NEWS.rst b/NEWS.rst --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,11 @@ History ======= +20.8.1 +------ + +Use correct gevent uri/option for Odoo 16+. + 20.8.0 ------ diff --git a/odoo_scripts/docker_dev_start.py b/odoo_scripts/docker_dev_start.py --- a/odoo_scripts/docker_dev_start.py +++ b/odoo_scripts/docker_dev_start.py @@ -496,8 +496,7 @@ force_python_dev_mode = nmspc.force_python_dev_mode force_no_python_dev_mode = nmspc.force_no_python_dev_mode workers = nmspc.workers - # XXX should that variable be called multi_workers? - longpolling = workers > 0 + gevent = workers > 0 test_tags = nmspc.test_tags activate_s3_storage = nmspc.activate_s3_storage @@ -558,13 +557,12 @@ "s3AttachmentStorageServerBucket": activate_s3_storage, } ) - # if not longpolling: options["hostname"] = project_name # TODO detect that from configuration or force it exposed_port = 8069 # TODO detect that from configuration or force it odoo_run_port = 8069 - if not longpolling and not use_host_network: + if not gevent and not use_host_network: options["ports"][exposed_port] = odoo_run_port mounts: List[Mount] = [] """Mounts for Odoo docker""" @@ -1331,8 +1329,8 @@ if marabunta_db_password: options["environment"]["MARABUNTA_DB_PASSWORD"] = marabunta_db_password - if longpolling: - longpolling_port = find_free_port() + if gevent: + gevent_port = find_free_port() run_kwargs: Dict[str, Any] = { "command": ["caddy", "run", "--config", "/etc/caddy/Caddyfile"], "detach": True, @@ -1349,10 +1347,25 @@ else: caddy_port = "2019" # TODO pre odoo 13: check if http-port should be changed to xmlrpc-port + gevent_uri = "/websocket" + gevent_option = "--gevent-port" + if odoo_type in ( + ODOO_7, + ODOO_8, + ODOO_9, + ODOO_10, + ODOO_11, + ODOO_12, + ODOO_13, + ODOO_14, + ODOO_15, + ): + gevent_uri = "/longpolling" + gevent_option = "--longpolling-port" arg.extend( ( - "--longpolling-port", - str(longpolling_port), + gevent_option, + str(gevent_port), "--http-port", str(odoo_run_port), ) @@ -1366,7 +1379,7 @@ }} :{caddy_port} {{ - reverse_proxy /longpolling/* {odoo_host}:{longpolling_port} + reverse_proxy {gevent_uri}/* {odoo_host}:{gevent_port} reverse_proxy {odoo_host}:{odoo_run_port} }} """