Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Add possibility to override task-name per port #101

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add possibility to override task-name per port #101

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
14 changes: 9 additions & 5 deletions mesos/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ func (m *Mesos) registerTask(t *state.Task, agent string) {
tags = []string{}
}

tags = buildRegisterTaskTags(tname, tags, m.taskTag)

for key := range t.DiscoveryInfo.Ports.DiscoveryPorts {
var porttags []string
discoveryPort := state.DiscoveryPort(t.DiscoveryInfo.Ports.DiscoveryPorts[key])
Expand All @@ -141,10 +139,15 @@ func (m *Mesos) registerTask(t *state.Task, agent string) {
} else {
porttags = []string{}
}
tnamePort := tname
if discoveryPort.Label("overrideTaskName") != "" {
tnamePort = discoveryPort.Label("overrideTaskName")
}
tags = buildRegisterTaskTags(tnamePort, tags, m.taskTag)
if discoveryPort.Name != "" {
m.Registry.Register(&registry.Service{
ID: fmt.Sprintf("%s:%s:%s:%s:%d", m.ServiceIdPrefix, agent, tname, address, discoveryPort.Number),
Name: tname,
ID: fmt.Sprintf("%s:%s:%s:%s:%d", m.ServiceIdPrefix, agent, tnamePort, address, discoveryPort.Number),
Name: tnamePort,
Port: toPort(servicePort),
Address: address,
Tags: append(append(tags, serviceName), porttags...),
Expand All @@ -158,7 +161,8 @@ func (m *Mesos) registerTask(t *state.Task, agent string) {
}
}

if t.Resources.PortRanges != "" {
if !registered && t.Resources.PortRanges != "" {
tags = buildRegisterTaskTags(tname, tags, m.taskTag)
for _, port := range t.Resources.Ports() {
m.Registry.Register(&registry.Service{
ID: fmt.Sprintf("%s:%s:%s:%s:%s", m.ServiceIdPrefix, agent, tname, address, port),
Expand Down