Skip to content

Commit cdc3038

Browse files
committed
cli/compose/loader: remove getLoggingDriver
Inline it in mergeLoggingConfig and add some vars, which also makes it more readable. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent c74b4a3 commit cdc3038

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

cli/compose/loader/merge.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,13 @@ func sliceToMap(tomap tomapFn, v reflect.Value) (map[any]any, error) {
230230
}
231231

232232
func mergeLoggingConfig(dst, src reflect.Value) error {
233+
dstDriver := dst.Elem().FieldByName("Driver").String()
234+
srcDriver := src.Elem().FieldByName("Driver").String()
235+
233236
// Same driver, merging options
234-
if getLoggingDriver(dst.Elem()) == getLoggingDriver(src.Elem()) ||
235-
getLoggingDriver(dst.Elem()) == "" || getLoggingDriver(src.Elem()) == "" {
236-
if getLoggingDriver(dst.Elem()) == "" {
237-
dst.Elem().FieldByName("Driver").SetString(getLoggingDriver(src.Elem()))
237+
if dstDriver == srcDriver || dstDriver == "" || srcDriver == "" {
238+
if dstDriver == "" {
239+
dst.Elem().FieldByName("Driver").SetString(srcDriver)
238240
}
239241
dstOptions := dst.Elem().FieldByName("Options").Interface().(map[string]string)
240242
srcOptions := src.Elem().FieldByName("Options").Interface().(map[string]string)
@@ -283,10 +285,6 @@ func mergeUint64(dst, src reflect.Value) error {
283285
return nil
284286
}
285287

286-
func getLoggingDriver(v reflect.Value) string {
287-
return v.FieldByName("Driver").String()
288-
}
289-
290288
func mergeVolumes(base, override map[string]types.VolumeConfig) (map[string]types.VolumeConfig, error) {
291289
err := mergo.Map(&base, &override, mergo.WithOverride)
292290
return base, err

0 commit comments

Comments
 (0)