add file change watch

config/config.go

@@ -123,6 +123,7 @@ type Static struct {
 type File struct {
 	NoRouteHTMLPath string
 	RoutesPath      string
+	Interval        time.Duration
 }
 
 type Consul struct {

config/default.go

@@ -64,6 +64,9 @@ var defaultConfig = &Config{
 		},
 		Timeout: 10 * time.Second,
 		Retry:   500 * time.Millisecond,
+		File: File{
+			Interval: 2 * time.Second,
+		},
 	},
 	Runtime: Runtime{
 		GOGC:       800,

config/load.go

@@ -161,6 +161,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
 	f.DurationVar(&cfg.Registry.Retry, "registry.retry", defaultConfig.Registry.Retry, "retry interval during startup")
 	f.StringVar(&cfg.Registry.File.RoutesPath, "registry.file.path", defaultConfig.Registry.File.RoutesPath, "path to file based routing table")
 	f.StringVar(&cfg.Registry.File.NoRouteHTMLPath, "registry.file.noroutehtmlpath", defaultConfig.Registry.File.NoRouteHTMLPath, "path to file for HTML returned when no route is found")
+	f.DurationVar(&cfg.Registry.File.Interval, "registry.file.interval", defaultConfig.Registry.File.Interval, "check file changed interval")
 	f.StringVar(&cfg.Registry.Static.Routes, "registry.static.routes", defaultConfig.Registry.Static.Routes, "static routes")
 	f.StringVar(&cfg.Registry.Static.NoRouteHTML, "registry.static.noroutehtml", defaultConfig.Registry.Static.NoRouteHTML, "HTML which is returned when no route is found")
 	f.StringVar(&cfg.Registry.Consul.Addr, "registry.consul.addr", defaultConfig.Registry.Consul.Addr, "address of the consul agent")

docs/content/ref/registry.file.interval.md

@@ -0,0 +1,10 @@
+---
+title: "registry.file.interval"
+---
+
+`registry.file.interval` configures check file changed interval time.
+
+
+The default is
+
+	registry.file.interval = 2s

docs/content/ref/registry.file.path.md

@@ -5,6 +5,13 @@ title: "registry.file.path"
 `registry.file.path` configures a file based routing table.
 The value configures the path to the file with the routing table.
 
+#### Example
+	registry.file.path = /home/zjj/route.txt
+file content like is
+```
+route add svc / http://1.2.3.4:5000/
+route add svc /test http://1.2.3.4:5001/
+```
 The default is
 
 	registry.file.path =

fabio.properties

@@ -590,6 +590,11 @@
 #
 # registry.file.noroutehtmlpath =
 
+# registry.file.interval configures check file changed interval time.
+#
+# The default is
+#
+# registry.file.interval = 2s
 
 # registry.consul.addr configures the address of the consul agent to connect to.
 #

registry/file/backend.go

@@ -1,30 +1,83 @@
 // Package file implements a simple file based registry
-// backend which reads the routes from a file once.
+// backend which reads the routes from a file.
+//file content like registry.static.routes = route add web-svc /test http://127.0.0.1:8082
+//registry.file.path = /home/zjj/fabio.txt
+//registry.file.noroutehtmlpath = /home/zjj/404.html
 package file
 
 import (
-	"io/ioutil"
-	"log"
+	"os"
+	"time"
 
 	"github.com/fabiolb/fabio/config"
 	"github.com/fabiolb/fabio/registry"
-	"github.com/fabiolb/fabio/registry/static"
 )
 
+type be struct {
+	cfg             *config.File
+	routesData      *filedata
+	noRouteHTMLData *filedata
+}
+
 func NewBackend(cfg *config.File) (registry.Backend, error) {
-	routes, err := ioutil.ReadFile(cfg.RoutesPath)
-	if err != nil {
-		log.Println("[ERROR] Cannot read routes from ", cfg.RoutesPath)
-		return nil, err
-	}
-	noroutehtml, err := ioutil.ReadFile(cfg.NoRouteHTMLPath)
-	if err != nil {
-		log.Println("[ERROR] Cannot read no route HTML from ", cfg.NoRouteHTMLPath)
+	if _, err := os.Stat(cfg.RoutesPath); err != nil {
 		return nil, err
 	}
-	staticCfg := &config.Static{
-		NoRouteHTML: string(noroutehtml),
-		Routes:      string(routes),
+
+	b := &be{cfg: cfg, routesData: &filedata{path: cfg.RoutesPath}, noRouteHTMLData: &filedata{path: cfg.NoRouteHTMLPath}}
+	return b, nil
+}
+
+func (b *be) Register(services []string) error {
+	return nil
+}
+
+func (b *be) Deregister(serviceName string) error {
+	return nil
+}
+
+func (b *be) DeregisterAll() error {
+	return nil
+}
+
+func (b *be) ManualPaths() ([]string, error) {
+	return nil, nil
+}
+
+func (b *be) ReadManual(string) (value string, version uint64, err error) {
+	return "", 0, nil
+}
+
+func (b *be) WriteManual(path string, value string, version uint64) (ok bool, err error) {
+	return false, nil
+}
+
+func (b *be) WatchServices() chan string {
+	ch := make(chan string)
+	go func() {
+		for {
+			readFile(b.routesData)
+			ch <- b.routesData.content
+			time.Sleep(b.cfg.Interval)
+		}
+	}()
+	return ch
+}
+
+func (b *be) WatchManual() chan string {
+	return make(chan string)
+}
+
+func (b *be) WatchNoRouteHTML() chan string {
+	ch := make(chan string)
+	if b.noRouteHTMLData.path != "" {
+		go func() {
+			for {
+				readFile(b.noRouteHTMLData)
+				ch <- b.noRouteHTMLData.content
+				time.Sleep(b.cfg.Interval)
+			}
+		}()
 	}
-	return static.NewBackend(staticCfg)
+	return ch
 }

registry/file/file.go

@@ -0,0 +1,38 @@
+package file
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"time"
+)
+
+//file data
+type filedata struct {
+	path    string
+	content string
+	mtime   time.Time
+}
+
+// Example
+// file := &filedata{path:"/home/zjj/routes.txt"}
+// err := readFile(file)
+func readFile(file *filedata) error {
+	finfo, err := os.Stat(file.path)
+	if err != nil {
+		log.Println("[ERROR] Cannot read file stats() from ", file.path)
+		return err
+	}
+
+	lastmtime := finfo.ModTime()
+	if file.mtime != lastmtime {
+		data, err := ioutil.ReadFile(file.path)
+		if err != nil {
+			log.Println("[ERROR] Cannot read file data from ", file.path)
+			return err
+		}
+		file.content = string(data)
+		file.mtime = lastmtime
+	}
+	return nil
+}