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

Restart the listener when reloading the server

Browse source
This commit is contained in:
Rico Sta. Cruz 2012-06-16 06:30:11 +08:00
parent 8a898f8239
commit b35de4834b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,8 @@ module Middleman
) )
mount_instance(app) mount_instance(app)
start_file_watcher unless options[:"disable-watcher"]
@initialized ||= false @initialized ||= false
unless @initialized unless @initialized
@ -39,8 +41,6 @@ module Middleman
register_signal_handlers unless ::Middleman::WINDOWS register_signal_handlers unless ::Middleman::WINDOWS
start_file_watcher unless options[:"disable-watcher"]
# Save the last-used options so it may be re-used when # Save the last-used options so it may be re-used when
# reloading later on. # reloading later on.
@last_options = options @last_options = options
@ -83,7 +83,10 @@ module Middleman
if added_and_modified.length > 0 if added_and_modified.length > 0
# See if the changed file is config.rb or lib/*.rb # See if the changed file is config.rb or lib/*.rb
return reload if needs_to_reload?(added_and_modified) if needs_to_reload?(added_and_modified)
reload
return listener.stop
end
# Otherwise forward to Middleman # Otherwise forward to Middleman
added_and_modified.each do |path| added_and_modified.each do |path|
@ -93,7 +96,10 @@ module Middleman
if removed.length > 0 if removed.length > 0
# See if the changed file is config.rb or lib/*.rb # See if the changed file is config.rb or lib/*.rb
return reload if needs_to_reload?(removed) if needs_to_reload?(removed)
reload
return listener.stop
end
# Otherwise forward to Middleman # Otherwise forward to Middleman
removed.each do |path| removed.each do |path|