@@ -404,7 +404,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
end
trap("HUP") do
- Merb.logger.warn! "\nDoing a fast deploy\n"
+ Merb.logger.warn! "Doing a fast deploy\n"
Process.kill("HUP", pid)
end
@@ -414,12 +414,19 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
exit_status[1] == 128 ? break : exit
end
if select(reader_ary, nil, nil, 0.25)
- msg = reader.readline
- msg =~ /128/ ? break : exit
+ begin
+ msg = reader.readline
+ if msg =~ /128/
+ break
+ else
+ Process.waitall
+ exit
+ end
+ rescue SystemCallError
+ exit
+ end
end
end
-
- puts "Broken out"
end
reader.close
@@ -762,7 +769,7 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
Thread.new do
loop do
sleep( seconds )
- block.call
+ yield
end
Thread.exit
end
@@ -773,26 +780,33 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
def self.run
return unless Merb::Config[:reload_classes]
- TimedExecutor.every(Merb::Config[:reload_time] || 0.5) do
- reload
- end
-
- end
-
- # Reloads all files.
- def self.reload
paths = []
Merb.load_paths.each do |path_name, file_info|
path, glob = file_info
next unless glob
paths << Dir[path / glob]
end
+
+ if Merb.dir_for(:application) && File.file?(Merb.dir_for(:application))
+ paths << Merb.dir_for(:application)
+ end
- paths << Merb.dir_for(:application) if Merb.dir_for(:application) && File.file?(Merb.dir_for(:application))
+ paths.flatten!
- paths.flatten.each do |file|
- next if Merb::BootLoader::LoadClasses::MTIMES[file] && Merb::BootLoader::LoadClasses::MTIMES[file] == File.mtime(file)
- Merb::BootLoader::LoadClasses.reload(file)
+ TimedExecutor.every(Merb::Config[:reload_time] || 0.5) do
+ GC.start
+ reload(paths)
+ end
+
+ end
+
+ # Reloads all files.
+ def self.reload(paths)
+ paths.each do |file|
+ next if LoadClasses::MTIMES[file] &&
+ LoadClasses::MTIMES[file] == File.mtime(file)
+
+ LoadClasses.reload(file)
end
end
end
lib/merb-core/bootloader.rb
@@ -11,7 +11,6 @@ module Merb
# ==== Returns.
# Class:: The adapter class.
def get(id)
- p @adapters[id.to_s]
Object.full_const_get(@adapters[id.to_s])
end
lib/merb-core/rack/adapter.rb
@@ -66,15 +66,19 @@ module Merb
end
def self.start_at_port(port, opts)
- trap('INT') do
- stop
- puts "\nExiting\n"
- exit
+ if Merb::Config[:daemonize]
+ trap('INT') do
+ stop
+ Merb.logger.warn! "Exiting port #{port}\n"
+ exit
+ end
+ else
+ trap('INT') { 1 }
end
trap('ABRT') do
stop
- puts "\nExiting\n"
+ Merb.logger.warn! "Exiting port #{port}\n"
exit(128)
end
@@ -86,7 +90,7 @@ module Merb
begin
@server = ::Mongrel::HttpServer.new(opts[:host], port)
rescue Errno::EADDRINUSE
- puts "\nPort #{port} was still in use. Trying again.\n"
+ puts "Port #{port} was still in use. Trying again.\n"
sleep 0.25
next
end
lib/merb-core/rack/adapter/mongrel.rb
@@ -114,7 +114,7 @@ module Merb
fork do
Process.setsid
exit if fork
- puts "In #{Process.pid}"
+ Merb.logger.warn! "In #{Process.pid}" if Merb.logger
File.umask 0000
STDIN.reopen "/dev/null"
STDOUT.reopen "/dev/null", "a"
lib/merb-core/server.rb
76eba224d0beed7a32a2e20826f0f0574a4e20c9
Yehuda Katz
wycats@gmail.com
http://github.com/wycats/merb-core/commit/717d5a8667a1fc206061c007e00528643676fb5e
717d5a8667a1fc206061c007e00528643676fb5e
2008-09-27T18:27:09-07:00
2008-09-24T00:05:26-07:00
Tighten things up so that ctrl-c works correctly
7b2bd7b3e60bc063c738010b1c29a7382fee039b
Yehuda Katz
wycats@gmail.com