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

Merge pull request #487 from rstacruz/listener_fix

Browse source 
Fix the listener/watcher
This commit is contained in:
Thomas Reynolds 2012-06-16 15:10:20 -07:00
parent 509c91999d b35de4834b
commit f3f508399c
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,13 +33,17 @@ module Middleman
mount_instance(app) mount_instance(app)
start_file_watcher unless options[:"disable-watcher"]
@initialized ||= false @initialized ||= false
unless @initialized unless @initialized
@initialized = true @initialized = true
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
# reloading later on.
@last_options = options
@webrick.start @webrick.start
end end
@ -56,7 +60,7 @@ module Middleman
# @return [void] # @return [void]
def reload def reload
stop stop
start start @last_options
end end
# Stop the current instance, exit Webrick # Stop the current instance, exit Webrick
@ -79,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|
@ -89,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|