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

actually run v2ctl

pull/714/merge v2.49
Darien Raymond 2017-11-17 00:51:04 +01:00
parent 6f885e0663
commit e69e6d00cb
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/config_json.go
View File

@ -26,7 +26,16 @@ func jsonToProto(input io.Reader) (*core.Config, error) {
return nil, err
}
defer stdoutReader.Close()
return core.LoadConfig(core.ConfigFormat_Protobuf, stdoutReader)
if err := cmd.Start(); err != nil {
return nil, err
}
config, err := core.LoadConfig(core.ConfigFormat_Protobuf, stdoutReader)
cmd.Wait()
return config, err
}
func init() {