status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: warn on service tags with invalid chars

This commit is contained in:
Ryan Uber 2015-02-09 09:30:06 -08:00
parent 5e801c905d
commit 722b255816
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
command/agent/agent.go
View File

@ -37,8 +37,8 @@ const (
)
var (
// serviceNameRe checks if a service name is compatible with DNS.
serviceNameRe = regexp.MustCompile(`^[a-zA-Z0-9\-]+$`)
// dnsNameRe checks if a name or tag is dns-compatible.
dnsNameRe = regexp.MustCompile(`^[a-zA-Z0-9\-]+$`)
)
/*
@ -602,11 +602,19 @@ func (a *Agent) AddService(service *structs.NodeService, chkTypes CheckTypes, pe
}
// Warn if the service name is incompatible with DNS
if !serviceNameRe.MatchString(service.Service) {
if !dnsNameRe.MatchString(service.Service) {
a.logger.Printf("[WARN] Service name %q will not be discoverable "+
"via DNS due to invalid characters", service.Service)
}
// Warn if any tags are incompatible with DNS
for _, tag := range service.Tags {
if !dnsNameRe.MatchString(tag) {
a.logger.Printf("[WARN] Service tag %q will not be discoverable "+
"via DNS due to invalid characters", tag)
}
}
// Add the service
a.state.AddService(service)