refactor and typo fixes

internal/route/http.go

@@ -89,7 +89,6 @@ func NewHTTPRoute(entry *entry.ReverseProxyEntry) (impl, E.Error) {
 	r := &HTTPRoute{
 		ReverseProxyEntry: entry,
 		rp:                rp,
-		task:              task.DummyTask(),
 		l: logger.With().
 			Str("type", string(entry.Scheme)).
 			Str("name", string(entry.Alias)).

internal/route/provider/event_handler.go

@@ -18,9 +18,9 @@ type EventHandler struct {
 	updated *E.Builder
 }
 
-func (provider *Provider) newEventHandler() *EventHandler {
+func (p *Provider) newEventHandler() *EventHandler {
 	return &EventHandler{
-		provider: provider,
+		provider: p,
 		errs:     E.NewBuilder("event errors"),
 		added:    E.NewBuilder("added"),
 		removed:  E.NewBuilder("removed"),
@@ -60,11 +60,12 @@ func (handler *EventHandler) Handle(parent task.Task, events []watcher.Event) {
 
 	oldRoutes.RangeAll(func(k string, oldr *route.Route) {
 		newr, ok := newRoutes.Load(k)
-		if !ok {
+		switch {
+		case !ok:
 			handler.Remove(oldr)
-		} else if handler.matchAny(events, newr) {
+		case handler.matchAny(events, newr):
 			handler.Update(parent, oldr, newr)
-		} else if entry.ShouldNotServe(newr) {
+		case entry.ShouldNotServe(newr):
 			handler.Remove(oldr)
 		}
 	})
@@ -122,11 +123,11 @@ func (handler *EventHandler) Update(parent task.Task, oldRoute *route.Route, new
 }
 
 func (handler *EventHandler) Log() {
-	results := E.NewBuilder("event occured")
-	results.Add(handler.added.Error())
-	results.Add(handler.removed.Error())
-	results.Add(handler.updated.Error())
-	results.Add(handler.errs.Error())
+	results := E.NewBuilder("event occurred")
+	results.AddFrom(handler.added, false)
+	results.AddFrom(handler.removed, false)
+	results.AddFrom(handler.updated, false)
+	results.AddFrom(handler.errs, false)
 	if result := results.String(); result != "" {
 		handler.provider.Logger().Info().Msg(result)
 	}

internal/route/provider/provider.go

@@ -45,9 +45,7 @@ const (
 	providerEventFlushInterval = 300 * time.Millisecond
 )
 
-var (
-	ErrEmptyProviderName = errors.New("empty provider name")
-)
+var ErrEmptyProviderName = errors.New("empty provider name")
 
 func newProvider(name string, t ProviderType) *Provider {
 	return &Provider{
@@ -109,12 +107,11 @@ func (p *Provider) startRoute(parent task.Task, r *R.Route) E.Error {
 		p.routes.Delete(r.Entry.Alias)
 		subtask.Finish(err) // just to ensure
 		return err.Subject(r.Entry.Alias)
-	} else {
-		p.routes.Store(r.Entry.Alias, r)
-		subtask.OnFinished("del from provider", func() {
-			p.routes.Delete(r.Entry.Alias)
-		})
 	}
+	p.routes.Store(r.Entry.Alias, r)
+	subtask.OnFinished("del from provider", func() {
+		p.routes.Delete(r.Entry.Alias)
+	})
 	return nil
 }
 

internal/route/route.go

@@ -80,11 +80,12 @@ func FromEntries(entries entry.RawEntries) (Routes, E.Error) {
 	entries.RangeAllParallel(func(alias string, en *entry.RawEntry) {
 		en.Alias = alias
 		r, err := NewRoute(en)
-		if err != nil {
+		switch {
+		case err != nil:
 			b.Add(err.Subject(alias))
-		} else if entry.ShouldNotServe(r) {
+		case entry.ShouldNotServe(r):
 			return
-		} else {
+		default:
 			routes.Store(alias, r)
 		}
 	})

internal/route/stream.go

@@ -44,7 +44,6 @@ func NewStreamRoute(entry *entry.StreamEntry) (impl, E.Error) {
 	}
 	return &StreamRoute{
 		StreamEntry: entry,
-		task:        task.DummyTask(),
 		l: logger.With().
 			Str("type", string(entry.Scheme.ListeningScheme)).
 			Str("name", entry.TargetName()).