make polling interval a parameter

Author: HurSungYun

daemon.go

@@ -84,9 +84,6 @@ import (
 // Milliseconds to wait for the next job to begin after a file change
 const WorkDelay = 900
 
-// Milliseconds of interval between polling file changes when polling option is selected
-const PollingInterval = 100
-
 // Default pattern to match files which trigger a build
 const FilePattern = `(.+\.go|.+\.c)$`
 
@@ -124,6 +121,7 @@ var (
 	flagGracefulTimeout = flag.Uint("graceful-timeout", 3, "Duration (in seconds) to wait for graceful kill to complete")
 	flagVerbose         = flag.Bool("verbose", false, "Be verbose about which directories are watched.")
 	flagPolling         = flag.Bool("polling", false, "Use polling method to watch file change instead of fsnotify")
+	flagPollingInterval = flag.Int("polling-interval", 100, "Milliseconds of interval between polling file changes when polling option is selected")
 
 	// initialized in main() due to custom type.
 	flagDirectories   globList
@@ -394,14 +392,15 @@ func main() {
 	pattern := regexp.MustCompile(*flagPattern)
 
 	cfg := &WatcherConfig{
-		flagVerbose:       *flagVerbose,
-		flagRecursive:     *flagRecursive,
-		flagPolling:       *flagPolling,
-		flagDirectories:   flagDirectories,
-		flagExcludedDirs:  flagExcludedDirs,
-		flagExcludedFiles: flagExcludedFiles,
-		flagIncludedFiles: flagIncludedFiles,
-		pattern:           pattern,
+		flagVerbose:         *flagVerbose,
+		flagRecursive:       *flagRecursive,
+		flagPolling:         *flagPolling,
+		flagPollingInterval: *flagPollingInterval,
+		flagDirectories:     flagDirectories,
+		flagExcludedDirs:    flagExcludedDirs,
+		flagExcludedFiles:   flagExcludedFiles,
+		flagIncludedFiles:   flagIncludedFiles,
+		pattern:             pattern,
 	}
 	watcher, err := NewWatcher(cfg)
 

watcher.go

@@ -13,21 +13,26 @@ import (
 	"time"
 )
 
-func pathMatches(cfg *WatcherConfig, pathName string) bool {
-	base := filepath.Base(pathName)
-	return (cfg.flagIncludedFiles.Matches(base) || matchesPattern(cfg.pattern, pathName)) &&
+func directoryShouldBeTracked(cfg *WatcherConfig, path string) bool {
+	return cfg.flagRecursive == true && !cfg.flagExcludedDirs.Matches(path)
+}
+
+func pathMatches(cfg *WatcherConfig, path string) bool {
+	base := filepath.Base(path)
+	return (cfg.flagIncludedFiles.Matches(base) || matchesPattern(cfg.pattern, path)) &&
 		!cfg.flagExcludedFiles.Matches(base)
 }
 
 type WatcherConfig struct {
-	flagVerbose       bool
-	flagPolling       bool
-	flagRecursive     bool
-	flagDirectories   globList
-	flagExcludedDirs  globList
-	flagExcludedFiles globList
-	flagIncludedFiles globList
-	pattern           *regexp.Regexp
+	flagVerbose         bool
+	flagPolling         bool
+	flagRecursive       bool
+	flagPollingInterval int
+	flagDirectories     globList
+	flagExcludedDirs    globList
+	flagExcludedFiles   globList
+	flagIncludedFiles   globList
+	pattern             *regexp.Regexp
 }
 
 type FileWatcher interface {
@@ -57,7 +62,7 @@ func (n NotifyWatcher) Watch(jobs chan<- string) {
 		case ev := <-n.watcher.Events:
 			if ev.Op&fsnotify.Remove == fsnotify.Remove || ev.Op&fsnotify.Write == fsnotify.Write || ev.Op&fsnotify.Create == fsnotify.Create {
 				// Assume it is a directory and track it.
-				if n.cfg.flagRecursive == true && !n.cfg.flagExcludedDirs.Matches(ev.Name) {
+				if directoryShouldBeTracked(n.cfg, ev.Name) {
 					n.watcher.Add(ev.Name)
 				}
 				if pathMatches(n.cfg, ev.Name) {
@@ -104,7 +109,7 @@ func (p PollingWatcher) AddFiles() error {
 func (p PollingWatcher) Watch(jobs chan<- string) {
 	// Start the watching process.
 	go func() {
-		if err := p.watcher.Start(PollingInterval * time.Millisecond); err != nil {
+		if err := p.watcher.Start(time.Duration(p.cfg.flagPollingInterval) * time.Millisecond); err != nil {
 			log.Fatalln(err)
 		}
 	}()