github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

format log

pull/314/head v2.1.1
Darien Raymond 2016-09-19 14:41:58 +02:00
parent 5f5d28009f
commit 5291624165
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/point/config_json.go
View File

@ -258,14 +258,14 @@ func JsonLoadConfig(file string) (*Config, error) {
fixedFile := os.ExpandEnv(file) fixedFile := os.ExpandEnv(file)
rawConfig, err := ioutil.ReadFile(fixedFile) rawConfig, err := ioutil.ReadFile(fixedFile)
if err != nil { if err != nil {
log.Error("Failed to read server config file (", file, "): ", file, err) log.Error("Point: Failed to read server config file (", file, "): ", file, err)
return nil, err return nil, err
} }
jsonConfig := &Config{} jsonConfig := &Config{}
err = json.Unmarshal(rawConfig, jsonConfig) err = json.Unmarshal(rawConfig, jsonConfig)
if err != nil { if err != nil {
log.Error("Failed to load server config: ", err) log.Error("Point: Failed to load server config: ", err)
return nil, err return nil, err
} }