deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1782 from jsdalton/allow-watcher-disable-in-server-mode

Browse source 
Disable file watching completely when watcher_disable is true
This commit is contained in:
Thomas Reynolds 2016-01-28 00:05:40 -08:00
commit e169d3d07e
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
middleman-core/lib/middleman-core/preview_server.rb
View file

@ -151,19 +151,19 @@ module Middleman
config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
ready do
match_against = [
%r{^config\.rb$},
%r{^environments/[^\.](.*)\.rb$},
%r{^lib/[^\.](.*)\.rb$},
%r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
]
# config.rb
watcher = files.watch :reload,
path: root,
only: match_against
unless config[:watcher_disable]
match_against = [
%r{^config\.rb$},
%r{^environments/[^\.](.*)\.rb$},
%r{^lib/[^\.](.*)\.rb$},
%r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
]
# config.rb
watcher = files.watch :reload,
path: root,
only: match_against
# Hack around node_modules in root.
watcher.listener.ignore(/^node_modules/)