lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-05-04 11:39:08 -04:00
Code Issues Releases Wiki Activity

completely remove json folder in v2ray

Browse Source
This commit is contained in:
v2ray
2016-01-17 21:43:10 +01:00
parent 9af80c834b
commit dde47290d7
19 changed files with 391 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testing/scenarios/server_env.go
View File

@@ -7,7 +7,6 @@ import (
_ "github.com/v2ray/v2ray-core/app/router/rules"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/shell/point"
pointjson "github.com/v2ray/v2ray-core/shell/point/json"
// The following are neccesary as they register handlers in their init functions.
_ "github.com/v2ray/v2ray-core/proxy/blackhole"
@@ -39,7 +38,7 @@ func InitializeServerSetOnce(testcase string) error {
}
func InitializeServer(configFile string) error {
config, err := pointjson.LoadConfig(configFile)
config, err := point.LoadConfig(configFile)
if err != nil {
log.Error("Failed to read config file (%s): %v", configFile, err)
return err