move common/log to app/log

This commit is contained in:
Darien Raymond
2017-02-01 21:35:40 +01:00
parent 57fc444b3c
commit f046f334cd
59 changed files with 290 additions and 154 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/log"
"v2ray.com/core/app/log"
"v2ray.com/core/common/net"
"v2ray.com/core/proxy"
)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/log"
"v2ray.com/core/app/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
)
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"v2ray.com/core/app/proxyman"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/log"
"v2ray.com/core/app/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
"v2ray.com/core/transport/internet"
+4
View File
@@ -24,6 +24,10 @@ func (DefaultOutboundHandlerManager) Interface() interface{} {
return (*proxyman.OutboundHandlerManager)(nil)
}
func (DefaultOutboundHandlerManager) Start() error { return nil }
func (DefaultOutboundHandlerManager) Close() {}
func (v *DefaultOutboundHandlerManager) GetDefaultHandler() proxyman.OutboundHandler {
v.RLock()
defer v.RUnlock()
+2
View File
@@ -29,6 +29,8 @@ type OutboundHandlerManager interface {
GetHandler(tag string) OutboundHandler
GetDefaultHandler() OutboundHandler
AddHandler(ctx context.Context, config *OutboundHandlerConfig) error
Start() error
Close()
}
type OutboundHandler interface {