Skip to content
This repository was archived by the owner on Sep 1, 2025. It is now read-only.

Commit 9b1a280

Browse files
author
George Vine
committed
BUG/MEDIUM: resolvers: change parser for parse-resolv-conf keyword
1 parent aa51389 commit 9b1a280

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

section-parsers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ func (p *configParser) getResolverParser() *Parsers {
738738
addParser(parser, &sequence, &simple.Timeout{Name: "resolve"})
739739
addParser(parser, &sequence, &simple.Timeout{Name: "retry"})
740740
addParser(parser, &sequence, &simple.Word{Name: "accepted_payload_size"})
741-
addParser(parser, &sequence, &simple.Word{Name: "parse-resolv-conf"})
741+
addParser(parser, &sequence, &simple.Enabled{Name: "parse-resolv-conf"})
742742
addParser(parser, &sequence, &simple.Word{Name: "resolve_retries"})
743743
return p.createParsers(parser, sequence)
744744
}

tests/configs/haproxy.cfg.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,18 @@ mailers mymailers2
129129
resolvers mirko
130130
nameserver ns_1_new_name_for_0 0.0.0.0:8080
131131
nameserver ns_2_new_name 0.0.0.0:8081
132-
hold obsolete 5s
133-
hold valid 5s
134-
timeout retry 5s
135-
accepted_payload_size 323
132+
nameserver dns3 tcp@10.0.0.3:53
133+
hold nx 30s
134+
hold obsolete 30s
135+
hold other 30s
136+
hold refused 30s
137+
hold timeout 30s
138+
hold valid 10s
139+
timeout resolve 1s
140+
timeout retry 1s
141+
accepted_payload_size 4096
142+
parse-resolv-conf
143+
resolve_retries 3
136144
137145
cache foobar
138146
total-max-size 4

0 commit comments

Comments
 (0)