summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2023-09-05 07:24:54 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2023-09-05 19:17:55 +0000
commit41143c901a75667b256342a2bec82344684cc6cb (patch)
tree0ffecbd69acaf7e776c799b23457cee06fb64b36
parent8e22a2f6f77dc2d10969d8603c59a8834164b903 (diff)
downloadvyos-1x-41143c901a75667b256342a2bec82344684cc6cb.tar.gz
vyos-1x-41143c901a75667b256342a2bec82344684cc6cb.zip
T5548: Fix load-balancing reverse-proxy timeouts
By default haproxy uses timeouts in millisecond but we set timeouts in seconds from CLI Fix template to use 'seconds' units (cherry picked from commit 257019520c49c20824b7e5cad01d2d29ef5f62e6)
-rw-r--r--data/templates/load-balancing/haproxy.cfg.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/load-balancing/haproxy.cfg.j2 b/data/templates/load-balancing/haproxy.cfg.j2
index f8e1587f8..0a40e1ecf 100644
--- a/data/templates/load-balancing/haproxy.cfg.j2
+++ b/data/templates/load-balancing/haproxy.cfg.j2
@@ -150,13 +150,13 @@ backend {{ back }}
{% endfor %}
{% endif %}
{% if back_config.timeout.check is vyos_defined %}
- timeout check {{ back_config.timeout.check }}
+ timeout check {{ back_config.timeout.check }}s
{% endif %}
{% if back_config.timeout.connect is vyos_defined %}
- timeout connect {{ back_config.timeout.connect }}
+ timeout connect {{ back_config.timeout.connect }}s
{% endif %}
{% if back_config.timeout.server is vyos_defined %}
- timeout server {{ back_config.timeout.server }}
+ timeout server {{ back_config.timeout.server }}s
{% endif %}
{% endfor %}