Forráskód Böngészése

Rename BadConfiguration to ErrorBadConfiguration

v2ray 9 éve
szülő
commit
2f76680fe9
3 módosított fájl, 7 hozzáadás és 7 törlés
  1. 1 1
      shell/point/config.go
  2. 1 1
      shell/point/errors.go
  3. 5 5
      shell/point/point.go

+ 1 - 1
shell/point/config.go

@@ -67,7 +67,7 @@ var (
 
 func LoadConfig(init string) (*Config, error) {
 	if configLoader == nil {
-		return nil, BadConfiguration
+		return nil, ErrorBadConfiguration
 	}
 	return configLoader(init)
 }

+ 1 - 1
shell/point/errors.go

@@ -5,5 +5,5 @@ import (
 )
 
 var (
-	BadConfiguration = errors.New("Bad configuration.")
+	ErrorBadConfiguration = errors.New("Bad configuration.")
 )

+ 5 - 5
shell/point/point.go

@@ -84,19 +84,19 @@ func NewPoint(pConfig *Config) (*Point, error) {
 				dh, err := NewInboundDetourHandlerAlways(vpoint.space.ForContext(detourConfig.Tag), detourConfig)
 				if err != nil {
 					log.Error("Point: Failed to create detour handler: ", err)
-					return nil, BadConfiguration
+					return nil, ErrorBadConfiguration
 				}
 				detourHandler = dh
 			case AllocationStrategyRandom:
 				dh, err := NewInboundDetourHandlerDynamic(vpoint.space.ForContext(detourConfig.Tag), detourConfig)
 				if err != nil {
 					log.Error("Point: Failed to create detour handler: ", err)
-					return nil, BadConfiguration
+					return nil, ErrorBadConfiguration
 				}
 				detourHandler = dh
 			default:
 				log.Error("Point: Unknown allocation strategy: ", allocConfig.Strategy)
-				return nil, BadConfiguration
+				return nil, ErrorBadConfiguration
 			}
 			vpoint.idh[idx] = detourHandler
 			if len(detourConfig.Tag) > 0 {
@@ -123,7 +123,7 @@ func NewPoint(pConfig *Config) (*Point, error) {
 		r, err := router.CreateRouter(routerConfig.Strategy, routerConfig.Settings)
 		if err != nil {
 			log.Error("Failed to create router: ", err)
-			return nil, BadConfiguration
+			return nil, ErrorBadConfiguration
 		}
 		vpoint.router = r
 	}
@@ -143,7 +143,7 @@ func (this *Point) Close() {
 func (this *Point) Start() error {
 	if this.port <= 0 {
 		log.Error("Invalid port ", this.port)
-		return BadConfiguration
+		return ErrorBadConfiguration
 	}
 
 	err := retry.Timed(100 /* times */, 100 /* ms */).On(func() error {