Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

Check for MESOS_TCP in healthcheck protocols #509

Merged
merged 1 commit into from
Feb 7, 2018
Merged

Check for MESOS_TCP in healthcheck protocols #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions marathon_lb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,8 @@ def config(apps, groups, bind_http_https, ssl_certs, templater,
if app.healthCheck:
template_backend_health_check = None
if app.mode == 'tcp' \
or app.healthCheck['protocol'] == 'TCP':
or app.healthCheck['protocol'] == 'TCP' \
or app.healthCheck['protocol'] == 'MESOS_TCP':
template_backend_health_check = templater \
.haproxy_backend_tcp_healthcheck_options(app)
elif app.mode == 'http':
Expand Down Expand Up @@ -559,7 +560,9 @@ def config(apps, groups, bind_http_https, ssl_certs, templater,
server_health_check_options = None
if app.healthCheck:
template_server_healthcheck_options = None
if app.mode == 'tcp' or app.healthCheck['protocol'] == 'TCP':
if app.mode == 'tcp' \
or app.healthCheck['protocol'] == 'TCP' \
or app.healthCheck['protocol'] == 'MESOS_TCP':
template_server_healthcheck_options = templater \
.haproxy_backend_server_tcp_healthcheck_options(app)
elif app.mode == 'http':
Expand Down