From 5dbf567c41626593604cd154da886fe76dced0f8 Mon Sep 17 00:00:00 2001 From: Wade Carpenter Date: Thu, 5 May 2022 10:50:15 -0700 Subject: [PATCH] chore: fix Error log calls in mergeMaps The logger interface uses k,v pairs, but it was being called with a format string, here. Changed to use k,v pairs. I didn't find any other instances of this problem. --- viper.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/viper.go b/viper.go index 4a9dac9d4..9d45018d0 100644 --- a/viper.go +++ b/viper.go @@ -1798,8 +1798,13 @@ func mergeMaps( tsv, ok := sv.(map[interface{}]interface{}) if !ok { v.logger.Error( - "Could not cast sv to map[interface{}]interface{}; key=%s, st=%v, tt=%v, sv=%v, tv=%v", - sk, svType, tvType, sv, tv) + "Could not cast sv to map[interface{}]interface{}", + "key", sk, + "st", svType, + "tt", tvType, + "sv", sv, + "tv", tv, + ) continue } @@ -1811,8 +1816,13 @@ func mergeMaps( tsv, ok := sv.(map[string]interface{}) if !ok { v.logger.Error( - "Could not cast sv to map[string]interface{}; key=%s, st=%v, tt=%v, sv=%v, tv=%v", - sk, svType, tvType, sv, tv) + "Could not cast sv to map[string]interface{}", + "key", sk, + "st", svType, + "tt", tvType, + "sv", sv, + "tv", tv, + ) continue } mergeMaps(tsv, ttv, nil)