From 0be34fa2b5f37689f1cb83275fa721f548379bc4 Mon Sep 17 00:00:00 2001 From: default Date: Sun, 6 Aug 2023 12:58:27 +0200 Subject: [PATCH] [FIX] longpolling is replace by websocket since 16.0 version of odoo in reverse proxy --- odoo-tecnativa/metadata.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/odoo-tecnativa/metadata.yml b/odoo-tecnativa/metadata.yml index ee13bf5..c524d42 100644 --- a/odoo-tecnativa/metadata.yml +++ b/odoo-tecnativa/metadata.yml @@ -14,7 +14,7 @@ docker-compose: tty: true environment: INITIAL_LANG: fr_FR - LIST_DB: 'true' + LIST_DB: "true" default-options: workers: 1 @@ -63,10 +63,16 @@ uses: - !bash-stdout | workers=$(relation-base-compose-get workers 2>/dev/null) workers=${workers:-1} - if [ "$workers" -gt 1 ]; then + version=`/opt/odoo/custom/src/odoo/odoo-bin --version` + version=$((${version: -4:2})) + if [ "$workers" -gt 1 ] && [ $version -lt 16]; then echo "ProxyPass /longpolling/ http://${MASTER_BASE_SERVICE_NAME}:8072/longpolling/" echo "ProxyPassReverse /longpolling/ http://${MASTER_BASE_SERVICE_NAME}:8072/longpolling/" fi + if [ "$workers" -gt 1 ] && [ $version -ge 16]; then + echo "ProxyPass /websocket/ http://${MASTER_BASE_SERVICE_NAME}:8072/websocket/" + echo "ProxyPassReverse /websocket/ http://${MASTER_BASE_SERVICE_NAME}:8072/websocket/" + fi backup: constraint: recommended auto: pair @@ -81,7 +87,6 @@ uses: ## - must start with a '/', will start from $SERVICE_DATASTORE exclude-patterns: - "/var/lib/odoo/sessions/" - # network-isolation: # whitelist: ## required external services used by this service # - www.google.com