gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1273 from wyxloading/config_race

Browse source 
Fix data race about config
This commit is contained in:
Chris Lu 2020-04-13 22:24:51 -07:00 committed by GitHub
parent 2b5c4fbbf3 b556d3d035
commit 23715af402
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
weed/util/config.go
View file

@ -42,7 +42,8 @@ func LoadConfiguration(configFileName string, required bool) (loaded bool) {
} }
func GetViper() *viper.Viper { func GetViper() *viper.Viper {
v := viper.GetViper() v := &viper.Viper{}
*v = *viper.GetViper()
v.AutomaticEnv() v.AutomaticEnv()
v.SetEnvPrefix("weed") v.SetEnvPrefix("weed")
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))