Merge pull request revel#848 from revel/feature/load-templates-onappstart

brendensoares · brendensoares · commit 374e98368782 · 2015-01-10T01:41:33.000-08:00
Fixes regression bug that caused templates not to trigger hot reload
diff --git a/server.go b/server.go
@@ -90,19 +90,19 @@ func Run(port int) {
 	MainTemplateLoader = NewTemplateLoader(TemplatePaths)
 	MainTemplateLoader.Refresh()
 
-	// If desired (or by default), create a watcher for templates and routes.
-	// The watcher calls Refresh() on things on the first request.
-	if MainWatcher != nil && Config.BoolDefault("watch.templates", true) {
-		MainWatcher.Listen(MainTemplateLoader, MainTemplateLoader.paths...)
-	}
-
 	// The "watch" config variable can turn on and off all watching.
 	// (As a convenient way to control it all together.)
 	if Config.BoolDefault("watch", true) {
 		MainWatcher = NewWatcher()
 		Filters = append([]Filter{WatchFilter}, Filters...)
 	}
 
+	// If desired (or by default), create a watcher for templates and routes.
+	// The watcher calls Refresh() on things on the first request.
+	if MainWatcher != nil && Config.BoolDefault("watch.templates", true) {
+		MainWatcher.Listen(MainTemplateLoader, MainTemplateLoader.paths...)
+	}
+
 	go func() {
 		time.Sleep(100 * time.Millisecond)
 		fmt.Printf("Listening on %s...\n", localAddress)
