Skip to content

Commit adc99d2

Browse files
committed
BUG/MINOR: binds: fix duplicate name entry of binds
1 parent 1a3646f commit adc99d2

File tree

7 files changed

+15
-16
lines changed

7 files changed

+15
-16
lines changed

configuration/bind.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,16 +457,15 @@ func SerializeBind(b models.Bind, opt *options.ConfigurationOptions) types.Bind
457457
if err == nil {
458458
bind.Comment = comment
459459
}
460-
bind.Params = serializeBindParams(b.BindParams, bind.Path, opt)
461-
if b.Name != "" {
462-
bind.Params = append(bind.Params, &params.BindOptionValue{Name: "name", Value: b.Name})
463-
}
460+
bind.Params = serializeBindParams(b.BindParams, b.Name, bind.Path, opt)
464461
return bind
465462
}
466463

467-
func serializeBindParams(b models.BindParams, path string, opt *options.ConfigurationOptions) []params.BindOption { //nolint:gocognit,gocyclo,cyclop,maintidx
464+
func serializeBindParams(b models.BindParams, name string, path string, opt *options.ConfigurationOptions) []params.BindOption { //nolint:gocognit,gocyclo,cyclop,maintidx
468465
var options []params.BindOption
469-
if path != "" {
466+
if name != "" {
467+
options = append(options, &params.BindOptionValue{Name: "name", Value: name})
468+
} else if path != "" {
470469
options = append(options, &params.BindOptionValue{Name: "name", Value: path})
471470
}
472471
if b.SslCertificate != "" {

configuration/configuration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2886,7 +2886,7 @@ func (s *SectionObject) defaultBind(field reflect.Value) error {
28862886
return misc.CreateTypeAssertError("default-bind")
28872887
}
28882888
dBind := &types.DefaultBind{
2889-
Params: serializeBindParams(db.BindParams, "", s.Options),
2889+
Params: serializeBindParams(db.BindParams, db.Name, "", s.Options),
28902890
}
28912891

28922892
return s.set("default-bind", dBind)

configuration/global.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3148,7 +3148,7 @@ func SerializeGlobalSection(p parser.Parser, data *models.Global, opt *options.C
31483148
Path: *rAPI.Address,
31493149
Params: []params.BindOption{},
31503150
}
3151-
socket.Params = serializeBindParams(rAPI.BindParams, "", opt)
3151+
socket.Params = serializeBindParams(rAPI.BindParams, rAPI.Name, "", opt)
31523152
sockets = append(sockets, socket)
31533153
}
31543154
if err := p.Set(parser.Global, parser.GlobalSectionName, "stats socket", sockets); err != nil {

models/bind_compare_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/bind_params_compare_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/default_bind_compare_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/global_base_compare_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)