diff --git a/shell/point/config.go b/shell/point/config.go index d17c3af0..a8db892f 100644 --- a/shell/point/config.go +++ b/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) } diff --git a/shell/point/errors.go b/shell/point/errors.go index b29a90fd..0f42148e 100644 --- a/shell/point/errors.go +++ b/shell/point/errors.go @@ -5,5 +5,5 @@ import ( ) var ( - BadConfiguration = errors.New("Bad configuration.") + ErrorBadConfiguration = errors.New("Bad configuration.") ) diff --git a/shell/point/point.go b/shell/point/point.go index 7b697ca6..7f4344e0 100644 --- a/shell/point/point.go +++ b/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 {