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

fix ineffectual assign in core

pull/432/head
Darien Raymond 2017-02-10 16:54:51 +01:00
parent 5ccc915f8f
commit 6c0fc4b0ec
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
v2ray.go
View File

@ -8,6 +8,8 @@ import (
"v2ray.com/core/app/dns" "v2ray.com/core/app/dns"
"v2ray.com/core/app/log" "v2ray.com/core/app/log"
"v2ray.com/core/app/proxyman" "v2ray.com/core/app/proxyman"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net" "v2ray.com/core/common/net"
) )
@ -59,15 +61,14 @@ func NewPoint(config *Config) (*Point, error) {
} }
} }
logger := log.FromSpace(space) if log.FromSpace(space) == nil {
if logger == nil {
l, err := app.CreateAppFromConfig(ctx, &log.Config{ l, err := app.CreateAppFromConfig(ctx, &log.Config{
ErrorLogType: log.LogType_Console, ErrorLogType: log.LogType_Console,
ErrorLogLevel: log.LogLevel_Warning, ErrorLogLevel: log.LogLevel_Warning,
AccessLogType: log.LogType_None, AccessLogType: log.LogType_None,
}) })
if err != nil { if err != nil {
return nil, err return nil, errors.Base(err).Message("Core: Failed apply default log settings.")
} }
space.AddApplication(l) space.AddApplication(l)
} }
@ -78,7 +79,9 @@ func NewPoint(config *Config) (*Point, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
space.AddApplication(o) if err := space.AddApplication(o); err != nil {
return nil, errors.Base(err).Message("Core: Failed to add default outbound handler manager.")
}
outboundHandlerManager = o.(proxyman.OutboundHandlerManager) outboundHandlerManager = o.(proxyman.OutboundHandlerManager)
} }
@ -88,12 +91,13 @@ func NewPoint(config *Config) (*Point, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
space.AddApplication(o) if err := space.AddApplication(o); err != nil {
return nil, errors.Base(err).Message("Core: Failed to add default inbound handler manager.")
}
inboundHandlerManager = o.(proxyman.InboundHandlerManager) inboundHandlerManager = o.(proxyman.InboundHandlerManager)
} }
dnsServer := dns.FromSpace(space) if dns.FromSpace(space) == nil {
if dnsServer == nil {
dnsConfig := &dns.Config{ dnsConfig := &dns.Config{
NameServers: []*net.Endpoint{{ NameServers: []*net.Endpoint{{
Address: net.NewIPOrDomain(net.LocalHostDomain), Address: net.NewIPOrDomain(net.LocalHostDomain),
@ -103,8 +107,7 @@ func NewPoint(config *Config) (*Point, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
space.AddApplication(d) common.Must(space.AddApplication(d))
dnsServer = d.(dns.Server)
} }
disp := dispatcher.FromSpace(space) disp := dispatcher.FromSpace(space)