Move noroute store to it's own package

fabiolb · Dec 6, 2017 · 81ea194 · 81ea194
1 parent 883be35
commit 81ea194
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -23,6 +23,7 @@ import (
 	"github.com/fabiolb/fabio/exit"
 	"github.com/fabiolb/fabio/logger"
 	"github.com/fabiolb/fabio/metrics"
+	"github.com/fabiolb/fabio/noroute"
 	"github.com/fabiolb/fabio/proxy"
 	"github.com/fabiolb/fabio/proxy/tcp"
 	"github.com/fabiolb/fabio/registry"
@@ -418,7 +419,7 @@ func watchNoRouteHTML(cfg *config.Config) {
 		if next == last {
 			continue
 		}
-		route.SetHTML(next)
+		noroute.SetHTML(next)
 		last = next
 	}
 }

diff --git a/route/no_route.go → noroute/no_route.go b/route/no_route.go → noroute/no_route.go
@@ -1,4 +1,4 @@
-package route
+package noroute
 
 import (
     "log"

diff --git a/proxy/http_integration_test.go b/proxy/http_integration_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/fabiolb/fabio/config"
 	"github.com/fabiolb/fabio/logger"
+	"github.com/fabiolb/fabio/noroute"
 	"github.com/fabiolb/fabio/proxy/internal"
 	"github.com/fabiolb/fabio/route"
 	"github.com/pascaldekloe/goe/verify"
@@ -77,7 +78,7 @@ func TestProxyRequestIDHeader(t *testing.T) {
 
 func TestProxyNoRouteHTML(t *testing.T) {
 	want := "<html>503</html>"
-	route.SetHTML(want)
+	noroute.SetHTML(want)
 	proxy := httptest.NewServer(&HTTPProxy{
 		Transport: http.DefaultTransport,
 		Lookup:    func(*http.Request) *route.Target { return nil },

diff --git a/proxy/http_proxy.go b/proxy/http_proxy.go
@@ -14,6 +14,7 @@ import (
 	"github.com/fabiolb/fabio/config"
 	"github.com/fabiolb/fabio/logger"
 	"github.com/fabiolb/fabio/metrics"
+	"github.com/fabiolb/fabio/noroute"
 	"github.com/fabiolb/fabio/proxy/gzip"
 	"github.com/fabiolb/fabio/route"
 	"github.com/fabiolb/fabio/uuid"
@@ -64,7 +65,7 @@ func (p *HTTPProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	t := p.Lookup(r)
 	if t == nil {
 		w.WriteHeader(p.Config.NoRouteStatus)
-		html := route.GetHTML()
+		html := noroute.GetHTML()
 		if html != "" {
 			io.WriteString(w, html)
 		}

diff --git a/registry/static/backend.go b/registry/static/backend.go
@@ -7,8 +7,8 @@ import (
 	"log"
 
 	"github.com/fabiolb/fabio/config"
+	"github.com/fabiolb/fabio/noroute"
 	"github.com/fabiolb/fabio/registry"
-	"github.com/fabiolb/fabio/route"
 )
 
 type be struct {
@@ -52,6 +52,6 @@ func (b *be) WatchNoRouteHTML() chan string {
 	if err != nil {
 		log.Printf("[WARN] Could not read NoRouteHTMLPath (%s)", b.cfg.NoRouteHTMLPath)
 	}
-	route.SetHTML(string(data))
+	noroute.SetHTML(string(data))
 	return make(chan string)
 }