avoid concurrent map updates to viper

1 files changed, 15 insertions, 3 deletions

diff --git a/weed/util/config.go b/weed/util/config.go
index 94e621e34..54edf5a3c 100644
--- a/weed/util/config.go
+++ b/weed/util/config.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"strings"
+	"sync"
 
 	"github.com/spf13/viper"
 
@@ -46,9 +47,20 @@ func LoadConfiguration(configFileName string, required bool) (loaded bool) {
 	return true
 }
 
-func GetViper() *viper.Viper {
-	v := &viper.Viper{}
-	*v = *viper.GetViper()
+type ViperProxy struct {
+	*viper.Viper
+	sync.Mutex
+}
+
+func (vp *ViperProxy) SetDefault(key string, value interface{}) {
+	vp.Lock()
+	defer vp.Unlock()
+	vp.Viper.SetDefault(key, value)
+}
+
+func GetViper() *ViperProxy {
+	v := &ViperProxy{}
+	v.Viper = viper.GetViper()
 	v.AutomaticEnv()
 	v.SetEnvPrefix("weed")
 	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))