Skip to content

Commit

Permalink
Formatting update
Browse files Browse the repository at this point in the history
  • Loading branch information
mkeeler committed Mar 27, 2018
1 parent 3facce6 commit ebc6f41
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
8 changes: 4 additions & 4 deletions agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,12 @@ func (a *Agent) Start() error {
a.logger.Printf("[WARN] agent: Node name %q will not be discoverable "+
"via DNS due to invalid characters. Valid characters include "+
"all alpha-numerics and dashes.", a.config.NodeName)
} else if ( len(a.config.NodeName) > MaxDNSLabelLength ) {
} else if len(a.config.NodeName) > MaxDNSLabelLength {
a.logger.Printf("[WARN] agent: Node name %q will not be discoverable "+
"via DNS due to it being too long. Valid lengths are between "+
"1 and 63 bytes.", a.config.NodeName)
}

// create the local state
a.State = local.NewState(LocalConfig(c), a.logger, a.tokens)

Expand Down Expand Up @@ -1560,7 +1560,7 @@ func (a *Agent) AddService(service *structs.NodeService, chkTypes []*structs.Che
a.logger.Printf("[WARN] agent: Service name %q will not be discoverable "+
"via DNS due to invalid characters. Valid characters include "+
"all alpha-numerics and dashes.", service.Service)
} else if ( len(service.Service) > MaxDNSLabelLength ) {
} else if len(service.Service) > MaxDNSLabelLength {
a.logger.Printf("[WARN] agent: Service name %q will not be discoverable "+
"via DNS due to it being too long. Valid lengths are between "+
"1 and 63 bytes.", service.Service)
Expand All @@ -1572,7 +1572,7 @@ func (a *Agent) AddService(service *structs.NodeService, chkTypes []*structs.Che
a.logger.Printf("[DEBUG] agent: Service tag %q will not be discoverable "+
"via DNS due to invalid characters. Valid characters include "+
"all alpha-numerics and dashes.", tag)
} else if ( len(tag) > MaxDNSLabelLength ) {
} else if len(tag) > MaxDNSLabelLength {
a.logger.Printf("[DEBUG] agent: Service tag %q will not be discoverable "+
"via DNS due to it being too long. Valid lengths are between "+
"1 and 63 bytes.", tag)
Expand Down
2 changes: 1 addition & 1 deletion agent/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
staleCounterThreshold = 5 * time.Second

defaultMaxUDPSize = 512

MaxDNSLabelLength = 63
)

Expand Down
14 changes: 7 additions & 7 deletions agent/dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3079,14 +3079,14 @@ func checkDNSService(t *testing.T, generateNumNodes int, aRecordLimit int, qType
func TestDNS_ServiceLookup_ARecordLimits(t *testing.T) {
t.Parallel()
tests := []struct {
name string
aRecordLimit int
expectedAResults int
name string
aRecordLimit int
expectedAResults int
expectedAAAAResults int
expectedSRVResults int
numNodesTotal int
udpSize uint16
udpAnswerLimit int
expectedSRVResults int
numNodesTotal int
udpSize uint16
udpAnswerLimit int
}{
// UDP + EDNS
{"udp-edns-1", 1, 1, 1, 30, 30, 8192, 3},
Expand Down
3 changes: 2 additions & 1 deletion agent/http_oss_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ var extraTestEndpoints = map[string][]string{
}

// These endpoints are ignored in unit testing for response codes
var ignoredEndpoints = []string{"/v1/status/peers","/v1/agent/monitor", "/v1/agent/reload" }
var ignoredEndpoints = []string{"/v1/status/peers", "/v1/agent/monitor", "/v1/agent/reload"}

// These have custom logic
var customEndpoints = []string{"/v1/query", "/v1/query/"}

Expand Down

0 comments on commit ebc6f41

Please sign in to comment.