completely remove json folder in v2ray

This commit is contained in:
v2ray committed 2016-01-17 21:43:10 +01:00
1 parent 9af80c834b
commit dde47290d7
19 files changed
+391 -587

No files matched your search

+1 -2
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