move common/log to app/log

tjl6666 · Feb 1, 2017 · f046f33 · f046f33
1 parent 57fc444
commit f046f33
Show file tree

Hide file tree

Showing 59 changed files with 290 additions and 154 deletions.
diff --git a/app/dispatcher/dispatcher.go b/app/dispatcher/dispatcher.go
@@ -10,6 +10,8 @@ import (
 // Interface dispatch a packet and possibly further network payload to its destination.
 type Interface interface {
 	DispatchToOutbound(ctx context.Context) ray.InboundRay
+	Start() error
+	Close()
 }
 
 func FromSpace(space app.Space) Interface {

diff --git a/app/dispatcher/impl/default.go b/app/dispatcher/impl/default.go
@@ -6,12 +6,12 @@ import (
 
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/dispatcher"
+	"v2ray.com/core/app/log"
 	"v2ray.com/core/app/proxyman"
 	"v2ray.com/core/app/router"
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/errors"
-	"v2ray.com/core/common/log"
 	"v2ray.com/core/proxy"
 	"v2ray.com/core/transport/ray"
 )
@@ -38,6 +38,12 @@ func NewDefaultDispatcher(ctx context.Context, config *dispatcher.Config) (*Defa
 	return d, nil
 }
 
+func (DefaultDispatcher) Start() error {
+	return nil
+}
+
+func (DefaultDispatcher) Close() {}
+
 func (DefaultDispatcher) Interface() interface{} {
 	return (*dispatcher.Interface)(nil)
 }

diff --git a/app/dns/config.go b/app/dns/config.go
@@ -3,7 +3,7 @@ package dns
 import (
 	"net"
 
-	"v2ray.com/core/common/log"
+	"v2ray.com/core/app/log"
 )
 
 func (v *Config) GetInternalHosts() map[string]net.IP {

diff --git a/app/dns/dns.go b/app/dns/dns.go
@@ -9,6 +9,8 @@ import (
 // A Server is a DNS server for responding DNS queries.
 type Server interface {
 	Get(domain string) []net.IP
+	Start() error
+	Close()
 }
 
 func FromSpace(space app.Space) Server {

diff --git a/app/dns/server/nameserver.go b/app/dns/server/nameserver.go
@@ -10,7 +10,7 @@ import (
 	"v2ray.com/core/app/dispatcher"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/dice"
-	"v2ray.com/core/common/log"
+	"v2ray.com/core/app/log"
 	v2net "v2ray.com/core/common/net"
 	"v2ray.com/core/transport/internet/udp"
 )

diff --git a/app/dns/server/server.go b/app/dns/server/server.go
@@ -10,9 +10,9 @@ import (
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/dispatcher"
 	"v2ray.com/core/app/dns"
+	"v2ray.com/core/app/log"
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/errors"
-	"v2ray.com/core/common/log"
 	v2net "v2ray.com/core/common/net"
 )
 
@@ -73,6 +73,12 @@ func (CacheServer) Interface() interface{} {
 	return (*dns.Server)(nil)
 }
 
+func (CacheServer) Start() error {
+	return nil
+}
+
+func (CacheServer) Close() {}
+
 // Private: Visible for testing.
 func (v *CacheServer) GetCached(domain string) []net.IP {
 	v.RLock()

diff --git a/common/log/access.go → app/log/access.go b/common/log/access.go → app/log/access.go
@@ -1,7 +1,7 @@
 package log
 
 import (
-	"v2ray.com/core/common/log/internal"
+	"v2ray.com/core/app/log/internal"
 )
 
 // AccessStatus is the status of an access request from clients.

diff --git a/common/log/config.go → app/log/config.go b/common/log/config.go → app/log/config.go
diff --git a/common/log/config.pb.go → app/log/config.pb.go b/common/log/config.pb.go → app/log/config.pb.go
@@ -73,10 +73,10 @@ func (x LogLevel) String() string {
 func (LogLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 type Config struct {
-	ErrorLogType  LogType  `protobuf:"varint,1,opt,name=error_log_type,json=errorLogType,enum=v2ray.core.common.log.LogType" json:"error_log_type,omitempty"`
-	ErrorLogLevel LogLevel `protobuf:"varint,2,opt,name=error_log_level,json=errorLogLevel,enum=v2ray.core.common.log.LogLevel" json:"error_log_level,omitempty"`
+	ErrorLogType  LogType  `protobuf:"varint,1,opt,name=error_log_type,json=errorLogType,enum=v2ray.core.app.log.LogType" json:"error_log_type,omitempty"`
+	ErrorLogLevel LogLevel `protobuf:"varint,2,opt,name=error_log_level,json=errorLogLevel,enum=v2ray.core.app.log.LogLevel" json:"error_log_level,omitempty"`
 	ErrorLogPath  string   `protobuf:"bytes,3,opt,name=error_log_path,json=errorLogPath" json:"error_log_path,omitempty"`
-	AccessLogType LogType  `protobuf:"varint,4,opt,name=access_log_type,json=accessLogType,enum=v2ray.core.common.log.LogType" json:"access_log_type,omitempty"`
+	AccessLogType LogType  `protobuf:"varint,4,opt,name=access_log_type,json=accessLogType,enum=v2ray.core.app.log.LogType" json:"access_log_type,omitempty"`
 	AccessLogPath string   `protobuf:"bytes,5,opt,name=access_log_path,json=accessLogPath" json:"access_log_path,omitempty"`
 }
 
@@ -121,34 +121,34 @@ func (m *Config) GetAccessLogPath() string {
 }
 
 func init() {
-	proto.RegisterType((*Config)(nil), "v2ray.core.common.log.Config")
-	proto.RegisterEnum("v2ray.core.common.log.LogType", LogType_name, LogType_value)
-	proto.RegisterEnum("v2ray.core.common.log.LogLevel", LogLevel_name, LogLevel_value)
+	proto.RegisterType((*Config)(nil), "v2ray.core.app.log.Config")
+	proto.RegisterEnum("v2ray.core.app.log.LogType", LogType_name, LogType_value)
+	proto.RegisterEnum("v2ray.core.app.log.LogLevel", LogLevel_name, LogLevel_value)
 }
 
-func init() { proto.RegisterFile("v2ray.com/core/common/log/config.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("v2ray.com/core/app/log/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 322 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x91, 0x6d, 0x4b, 0xf3, 0x30,
-	0x14, 0x86, 0xd7, 0x76, 0xaf, 0xd9, 0x5b, 0x08, 0x3c, 0xb0, 0xe7, 0x8b, 0x0e, 0x91, 0x31, 0x06,
-	0xb6, 0x30, 0xf1, 0x0f, 0xec, 0x4d, 0x84, 0x21, 0x63, 0x08, 0x82, 0x5f, 0x46, 0x17, 0xcf, 0xb2,
-	0x42, 0x9a, 0x53, 0xd2, 0x3a, 0xd8, 0x8f, 0xf2, 0x3f, 0x4a, 0x32, 0x6b, 0x15, 0x26, 0xf8, 0x31,
-	0xe1, 0x3a, 0xd7, 0x7d, 0x1f, 0x0e, 0x19, 0x1c, 0xc6, 0x3a, 0x3c, 0xfa, 0x1c, 0xe3, 0x80, 0xa3,
-	0x86, 0x80, 0x63, 0x1c, 0xa3, 0x0a, 0x24, 0x8a, 0x80, 0xa3, 0xda, 0x45, 0xc2, 0x4f, 0x34, 0x66,
-	0xc8, 0xfe, 0xe5, 0x9c, 0x06, 0xff, 0xc4, 0xf8, 0x12, 0xc5, 0xd5, 0xbb, 0x4b, 0xaa, 0x53, 0xcb,
-	0xb1, 0x19, 0xe9, 0x80, 0xd6, 0xa8, 0x37, 0x12, 0xc5, 0x26, 0x3b, 0x26, 0xd0, 0x73, 0xfa, 0xce,
-	0xb0, 0x33, 0xbe, 0xf0, 0xcf, 0x8e, 0xfa, 0x4b, 0x14, 0x4f, 0xc7, 0x04, 0xd6, 0x2d, 0x3b, 0xf5,
-	0xf9, 0x62, 0xf7, 0xa4, 0x5b, 0x58, 0x24, 0x1c, 0x40, 0xf6, 0x5c, 0xab, 0xb9, 0xfc, 0x5d, 0xb3,
-	0x34, 0xd8, 0xba, 0x9d, 0x7b, 0xec, 0x93, 0x5d, 0x7f, 0xaf, 0x93, 0x84, 0xd9, 0xbe, 0xe7, 0xf5,
-	0x9d, 0x61, 0xa3, 0x88, 0x5b, 0x85, 0xd9, 0x9e, 0x2d, 0x48, 0x37, 0xe4, 0x1c, 0xd2, 0xb4, 0x68,
-	0x5d, 0xfe, 0x53, 0xeb, 0xf6, 0x69, 0x2c, 0xaf, 0x3d, 0xf8, 0xe1, 0xb1, 0x71, 0x15, 0x1b, 0x57,
-	0x70, 0x26, 0x6f, 0x74, 0x47, 0x6a, 0xf9, 0x48, 0x9d, 0x94, 0x1f, 0x51, 0x01, 0x2d, 0xb1, 0x26,
-	0xa9, 0x4d, 0x51, 0xa5, 0x28, 0x81, 0x3a, 0xe6, 0x7b, 0x11, 0x49, 0xa0, 0x2e, 0x6b, 0x90, 0xca,
-	0xfc, 0x00, 0x2a, 0xa3, 0xde, 0x68, 0x4e, 0xea, 0x5f, 0x8b, 0xb5, 0x48, 0x7d, 0x16, 0xa5, 0xe1,
-	0x56, 0xc2, 0x2b, 0x2d, 0x59, 0xc8, 0x2c, 0x44, 0x1d, 0xa3, 0x79, 0x0e, 0xb5, 0x8a, 0x94, 0xa0,
-	0xae, 0xd1, 0x3c, 0xa8, 0x1d, 0x52, 0xcf, 0x10, 0x33, 0xd8, 0xbe, 0x09, 0x5a, 0x9e, 0xdc, 0x90,
-	0xff, 0x1c, 0xe3, 0xf3, 0x9b, 0x4d, 0x9a, 0xa7, 0x3b, 0xae, 0xcc, 0xb9, 0x5f, 0x3c, 0x89, 0x62,
-	0x5b, 0xb5, 0xa7, 0xbf, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0x11, 0x55, 0x7e, 0x04, 0x24, 0x02,
-	0x00, 0x00,
+	// 335 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4b, 0xc3, 0x30,
+	0x1c, 0xc5, 0xd7, 0x76, 0x3f, 0xb3, 0x5f, 0x21, 0x07, 0x19, 0xe8, 0x61, 0xa8, 0xc8, 0xd8, 0xa1,
+	0x85, 0x89, 0x67, 0xd9, 0xba, 0x09, 0xc2, 0x90, 0x31, 0x44, 0xc1, 0xcb, 0xc8, 0x6a, 0x96, 0x15,
+	0xb2, 0x7c, 0x43, 0x5a, 0x07, 0xfd, 0x7f, 0x3c, 0xf9, 0x57, 0x4a, 0x32, 0x6b, 0x15, 0x15, 0x8f,
+	0x29, 0xef, 0x7d, 0xde, 0x7b, 0x7c, 0x8b, 0xce, 0xf6, 0x23, 0x4d, 0x33, 0x3f, 0x82, 0x5d, 0x10,
+	0x81, 0x66, 0x01, 0x55, 0x2a, 0x10, 0xc0, 0x83, 0x08, 0xe4, 0x26, 0xe6, 0xbe, 0xd2, 0x90, 0x02,
+	0x21, 0xb9, 0x48, 0x33, 0x9f, 0x2a, 0xe5, 0x0b, 0xe0, 0xa7, 0xaf, 0x2e, 0xaa, 0x86, 0x56, 0x44,
+	0xc6, 0xa8, 0xc3, 0xb4, 0x06, 0xbd, 0x12, 0xc0, 0x57, 0x69, 0xa6, 0x58, 0xcf, 0xe9, 0x3b, 0x83,
+	0xce, 0xe8, 0xd8, 0xff, 0xe9, 0xf3, 0xe7, 0xc0, 0xef, 0x33, 0xc5, 0x96, 0x2d, 0x6b, 0xf9, 0x78,
+	0x91, 0x29, 0xea, 0x16, 0x08, 0xc1, 0xf6, 0x4c, 0xf4, 0x5c, 0xcb, 0x38, 0xf9, 0x83, 0x31, 0x37,
+	0x9a, 0x65, 0x3b, 0x87, 0xd8, 0x27, 0x39, 0xff, 0x5a, 0x44, 0xd1, 0x74, 0xdb, 0xf3, 0xfa, 0xce,
+	0xa0, 0x51, 0x64, 0x2d, 0x68, 0xba, 0x25, 0x21, 0xea, 0xd2, 0x28, 0x62, 0x49, 0x52, 0xf4, 0x2d,
+	0xff, 0xdf, 0xb7, 0x7d, 0xf0, 0xe4, 0x85, 0x2f, 0xbe, 0x41, 0x6c, 0x56, 0xc5, 0x66, 0x15, 0x3a,
+	0x13, 0x36, 0xbc, 0x42, 0xb5, 0xdc, 0x52, 0x47, 0xe5, 0x3b, 0x90, 0x0c, 0x97, 0x48, 0x13, 0xd5,
+	0x42, 0x90, 0x09, 0x08, 0x86, 0x1d, 0xf3, 0xf9, 0x26, 0x16, 0x0c, 0xbb, 0xa4, 0x81, 0x2a, 0xb3,
+	0x3d, 0x93, 0x29, 0xf6, 0x86, 0x33, 0x54, 0xff, 0x5c, 0xd5, 0x42, 0xf5, 0x69, 0x9c, 0xd0, 0xb5,
+	0x60, 0xcf, 0xb8, 0x64, 0x45, 0x66, 0x0d, 0x76, 0x0c, 0xe6, 0x91, 0x6a, 0x19, 0x4b, 0x8e, 0x5d,
+	0x83, 0xb9, 0x95, 0x1b, 0xc0, 0x9e, 0x51, 0x4c, 0xd9, 0xfa, 0x85, 0xe3, 0xf2, 0xe4, 0x1a, 0x1d,
+	0x45, 0xb0, 0xfb, 0x65, 0xd6, 0xa4, 0x79, 0xb8, 0xdd, 0xc2, 0xdc, 0xf7, 0xc9, 0x13, 0xc0, 0xdf,
+	0x5c, 0xf2, 0x30, 0x5a, 0xd2, 0xcc, 0x0f, 0x8d, 0x6c, 0xac, 0x94, 0x59, 0xbe, 0xae, 0xda, 0x1f,
+	0xe0, 0xf2, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x89, 0x56, 0x54, 0xa7, 0x27, 0x02, 0x00, 0x00,
 }
diff --git a/common/log/config.proto → app/log/config.proto b/common/log/config.proto → app/log/config.proto
@@ -1,8 +1,9 @@
 syntax = "proto3";
 
-package v2ray.core.common.log;
+package v2ray.core.app.log;
+option csharp_namespace = "V2Ray.Core.App.Log";
 option go_package = "log";
-option java_package = "com.v2ray.core.common.log";
+option java_package = "com.v2ray.core.app.log";
 option java_outer_classname = "ConfigProto";
 
 enum LogType {

diff --git a/common/log/internal/log_entry.go → app/log/internal/log_entry.go b/common/log/internal/log_entry.go → app/log/internal/log_entry.go
diff --git a/common/log/internal/log_entry_test.go → app/log/internal/log_entry_test.go b/common/log/internal/log_entry_test.go → app/log/internal/log_entry_test.go
@@ -3,7 +3,7 @@ package internal_test
 import (
 	"testing"
 
-	. "v2ray.com/core/common/log/internal"
+	. "v2ray.com/core/app/log/internal"
 	"v2ray.com/core/testing/assert"
 )
 

diff --git a/common/log/internal/log_writer.go → app/log/internal/log_writer.go b/common/log/internal/log_writer.go → app/log/internal/log_writer.go
diff --git a/common/log/internal/log_writer_test.go → app/log/internal/log_writer_test.go b/common/log/internal/log_writer_test.go → app/log/internal/log_writer_test.go
diff --git a/common/log/log.go → app/log/log.go b/common/log/log.go → app/log/log.go
@@ -1,8 +1,12 @@
 package log
 
 import (
+	"context"
+
+	"v2ray.com/core/app"
+	"v2ray.com/core/app/log/internal"
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/errors"
-	"v2ray.com/core/common/log/internal"
 )
 
 var (
@@ -77,7 +81,55 @@ func Error(val ...interface{}) {
 	})
 }
 
-func Close() {
+type Instance struct {
+	config *Config
+}
+
+func New(ctx context.Context, config *Config) (*Instance, error) {
+	return &Instance{config: config}, nil
+}
+
+func (*Instance) Interface() interface{} {
+	return (*Instance)(nil)
+}
+
+func (g *Instance) Start() error {
+	config := g.config
+	if config.AccessLogType == LogType_File {
+		if err := InitAccessLogger(config.AccessLogPath); err != nil {
+			return err
+		}
+	}
+
+	if config.ErrorLogType == LogType_None {
+		SetLogLevel(LogLevel_Disabled)
+	} else {
+		if config.ErrorLogType == LogType_File {
+			if err := InitErrorLogger(config.ErrorLogPath); err != nil {
+				return err
+			}
+		}
+		SetLogLevel(config.ErrorLogLevel)
+	}
+
+	return nil
+}
+
+func (*Instance) Close() {
 	streamLoggerInstance.Close()
 	accessLoggerInstance.Close()
 }
+
+func FromSpace(space app.Space) *Instance {
+	v := space.GetApplication((*Instance)(nil))
+	if logger, ok := v.(*Instance); ok && logger != nil {
+		return logger
+	}
+	return nil
+}
+
+func init() {
+	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
+		return New(ctx, config.(*Config))
+	}))
+}
diff --git a/app/proxyman/inbound/always.go b/app/proxyman/inbound/always.go
@@ -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"
 )

diff --git a/app/proxyman/inbound/dynamic.go b/app/proxyman/inbound/dynamic.go
@@ -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"
 )

diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go
@@ -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"

diff --git a/app/proxyman/outbound/outbound.go b/app/proxyman/outbound/outbound.go
@@ -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()

diff --git a/app/proxyman/proxyman.go b/app/proxyman/proxyman.go
@@ -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 {

diff --git a/app/router/router.go b/app/router/router.go
@@ -5,9 +5,9 @@ import (
 
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/dns"
+	"v2ray.com/core/app/log"
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/errors"
-	"v2ray.com/core/common/log"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/proxy"
 )
@@ -91,6 +91,12 @@ func (Router) Interface() interface{} {
 	return (*Router)(nil)
 }
 
+func (Router) Start() error {
+	return nil
+}
+
+func (Router) Close() {}
+
 func FromSpace(space app.Space) *Router {
 	app := space.GetApplication((*Router)(nil))
 	if app == nil {

diff --git a/app/space.go b/app/space.go
@@ -6,11 +6,12 @@ import (
 
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/errors"
-	"v2ray.com/core/common/log"
 )
 
 type Application interface {
 	Interface() interface{}
+	Start() error
+	Close()
 }
 
 type InitializationCallback func() error
@@ -35,6 +36,8 @@ type Space interface {
 	AddApplication(application Application) error
 	Initialize() error
 	OnInitialize(InitializationCallback)
+	Start() error
+	Close()
 }
 
 type spaceImpl struct {
@@ -52,9 +55,7 @@ func NewSpace() Space {
 
 func (v *spaceImpl) OnInitialize(f InitializationCallback) {
 	if v.initialized {
-		if err := f(); err != nil {
-			log.Error("Space: error after space initialization: ", err)
-		}
+		f()
 	} else {
 		v.appInit = append(v.appInit, f)
 	}
@@ -88,6 +89,21 @@ func (v *spaceImpl) AddApplication(app Application) error {
 	return nil
 }
 
+func (s *spaceImpl) Start() error {
+	for _, app := range s.cache {
+		if err := app.Start(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (s *spaceImpl) Close() {
+	for _, app := range s.cache {
+		app.Close()
+	}
+}
+
 type contextKey int
 
 const (

diff --git a/common/net/address.go b/common/net/address.go
@@ -3,7 +3,7 @@ package net
 import (
 	"net"
 
-	"v2ray.com/core/common/log"
+	"v2ray.com/core/app/log"
 	"v2ray.com/core/common/predicate"
 )