unified config loader

This commit is contained in:
v2ray
2016-06-10 22:26:39 +02:00
parent 3f7b70a465
commit e732ba62a6
18 changed files with 257 additions and 215 deletions
+2 -3
View File
@@ -5,7 +5,6 @@ import (
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/proxy/internal/config"
)
var (
@@ -51,7 +50,7 @@ func CreateInboundHandler(name string, space app.Space, rawConfig []byte, meta *
return nil, ErrorProxyNotFound
}
if len(rawConfig) > 0 {
proxyConfig, err := config.CreateInboundConfig(name, rawConfig)
proxyConfig, err := CreateInboundConfig(name, rawConfig)
if err != nil {
return nil, err
}
@@ -67,7 +66,7 @@ func CreateOutboundHandler(name string, space app.Space, rawConfig []byte, meta
}
if len(rawConfig) > 0 {
proxyConfig, err := config.CreateOutboundConfig(name, rawConfig)
proxyConfig, err := CreateOutboundConfig(name, rawConfig)
if err != nil {
return nil, err
}