lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-16 09:26:21 -05:00
Code Issues Releases Wiki Activity

rename config to jsonConfig to avoid name conflict

Browse Source
This commit is contained in:
V2Ray 2015-10-11 18:27:25 +02:00
parent 37112f737e
commit 0a1f5fe27e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/json/json.go
View File

@ -81,12 +81,12 @@ func LoadConfig(file string) (*Config, error) {
return nil, err return nil, err
} }
config := &Config{} jsonConfig := &Config{}
err = json.Unmarshal(rawConfig, config) err = json.Unmarshal(rawConfig, jsonConfig)
if err != nil { if err != nil {
log.Error("Failed to load server config: %v", err) log.Error("Failed to load server config: %v", err)
return nil, err return nil, err
} }
return config, err return jsonConfig, err
} }