cleanup shell/point/config

This commit is contained in:
v2ray committed 2015-12-06 16:41:41 +01:00
1 parent e1c58fae2b
commit 8bee0c4a7b
18 files changed
+341 -37

No files matched your search

+2 -2
View File
@@ -12,7 +12,7 @@ import (
_ "github.com/v2ray/v2ray-core/app/router/rules/config/json"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/shell/point"
jsonconf "github.com/v2ray/v2ray-core/shell/point/config/json"
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"
@@ -69,7 +69,7 @@ func main() {
log.Error("Config file is not set.")
return
}
config, err := jsonconf.LoadConfig(configFile)
config, err := pointjson.LoadConfig(configFile)
if err != nil {
log.Error("Failed to read config file (%s): %v", configFile, err)
return