Преглед на файлове

remove ErrMissingApplication

Darien Raymond преди 9 години
родител
ревизия
c041740940
променени са 8 файла, в които са добавени 11 реда и са изтрити 17 реда
  1. 2 2
      app/dispatcher/impl/default.go
  2. 2 2
      app/dns/server.go
  3. 1 2
      app/router/router.go
  4. 0 4
      app/space.go
  5. 2 2
      proxy/dokodemo/dokodemo.go
  6. 2 2
      proxy/freedom/freedom.go
  7. 1 1
      proxy/shadowsocks/server.go
  8. 1 2
      proxy/socks/server.go

+ 2 - 2
app/dispatcher/impl/default.go

@@ -1,6 +1,7 @@
 package impl
 
 import (
+	"errors"
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/proxyman"
 	"v2ray.com/core/app/router"
@@ -27,8 +28,7 @@ func NewDefaultDispatcher(space app.Space) *DefaultDispatcher {
 // Private: Used by app.Space only.
 func (this *DefaultDispatcher) Initialize(space app.Space) error {
 	if !space.HasApp(proxyman.APP_ID_OUTBOUND_MANAGER) {
-		log.Error("DefaultDispatcher: OutboundHandlerManager is not found in the space.")
-		return app.ErrMissingApplication
+		return errors.New("DefaultDispatcher: OutboundHandlerManager is not found in the space.")
 	}
 	this.ohm = space.GetApp(proxyman.APP_ID_OUTBOUND_MANAGER).(proxyman.OutboundHandlerManager)
 

+ 2 - 2
app/dns/server.go

@@ -1,6 +1,7 @@
 package dns
 
 import (
+	"errors"
 	"net"
 	"sync"
 	"time"
@@ -38,8 +39,7 @@ func NewCacheServer(space app.Space, config *Config) *CacheServer {
 	}
 	space.InitializeApplication(func() error {
 		if !space.HasApp(dispatcher.APP_ID) {
-			log.Error("DNS: Dispatcher is not found in the space.")
-			return app.ErrMissingApplication
+			return errors.New("DNS: Dispatcher is not found in the space.")
 		}
 
 		dispatcher := space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)

+ 1 - 2
app/router/router.go

@@ -45,8 +45,7 @@ func NewRouter(config *Config, space app.Space) *Router {
 		}
 
 		if !space.HasApp(dns.APP_ID) {
-			log.Error("Router: DNS is not found in the space.")
-			return app.ErrMissingApplication
+			return errors.New("Router: DNS is not found in the space.")
 		}
 		r.dnsServer = space.GetApp(dns.APP_ID).(dns.Server)
 		return nil

+ 0 - 4
app/space.go

@@ -6,10 +6,6 @@ import (
 	"v2ray.com/core/common"
 )
 
-var (
-	ErrMissingApplication = errors.New("App: Failed to found one or more applications.")
-)
-
 type ID int
 
 // Context of a function call from proxy to app.

+ 2 - 2
proxy/dokodemo/dokodemo.go

@@ -3,6 +3,7 @@ package dokodemo
 import (
 	"sync"
 
+	"errors"
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/dispatcher"
 	"v2ray.com/core/common/alloc"
@@ -39,8 +40,7 @@ func NewDokodemoDoor(config *Config, space app.Space, meta *proxy.InboundHandler
 	}
 	space.InitializeApplication(func() error {
 		if !space.HasApp(dispatcher.APP_ID) {
-			log.Error("Dokodemo: Dispatcher is not found in the space.")
-			return app.ErrMissingApplication
+			return errors.New("Dokodemo: Dispatcher is not found in the space.")
 		}
 		d.packetDispatcher = space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)
 		return nil

+ 2 - 2
proxy/freedom/freedom.go

@@ -3,6 +3,7 @@ package freedom
 import (
 	"io"
 
+	"errors"
 	"v2ray.com/core/app"
 	"v2ray.com/core/app/dns"
 	"v2ray.com/core/common/alloc"
@@ -35,8 +36,7 @@ func NewFreedomConnection(config *Config, space app.Space, meta *proxy.OutboundH
 	space.InitializeApplication(func() error {
 		if config.DomainStrategy == Config_USE_IP {
 			if !space.HasApp(dns.APP_ID) {
-				log.Error("Freedom: DNS server is not found in the space.")
-				return app.ErrMissingApplication
+				return errors.New("Freedom: DNS server is not found in the space.")
 			}
 			f.dns = space.GetApp(dns.APP_ID).(dns.Server)
 		}

+ 1 - 1
proxy/shadowsocks/server.go

@@ -50,7 +50,7 @@ func NewServer(config *ServerConfig, space app.Space, meta *proxy.InboundHandler
 
 	space.InitializeApplication(func() error {
 		if !space.HasApp(dispatcher.APP_ID) {
-			return app.ErrMissingApplication
+			return errors.New("Shadowsocks|Server: Dispatcher is not found in space.")
 		}
 		s.packetDispatcher = space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)
 		return nil

+ 1 - 2
proxy/socks/server.go

@@ -46,8 +46,7 @@ func NewServer(config *ServerConfig, space app.Space, meta *proxy.InboundHandler
 	}
 	space.InitializeApplication(func() error {
 		if !space.HasApp(dispatcher.APP_ID) {
-			log.Error("Socks|Server: Dispatcher is not found in the space.")
-			return app.ErrMissingApplication
+			return errors.New("Socks|Server: Dispatcher is not found in the space.")
 		}
 		s.packetDispatcher = space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)
 		return nil