@@ -615,7 +615,7 @@ module Merb
end
# ==== Parameters
- # *rakefiles:: Rakefile pathss to add to the list of Rakefiles.
+ # *rakefiles:: Rakefile paths to add to the list of Rakefiles.
#
# ==== Notes
# Recommended way to add Rakefiles load path for plugins authors.
@@ -634,6 +634,15 @@ module Merb
@generators += generators
end
+ # Install a signal handler for a given signal unless signals have
+ # been disabled with Merb.disable(:signals)
+ # ==== Parameters
+ # signal:: The name of the signal to install a handler for.
+ # &block:: The block to be run when the given signal is received.
+ def trap(signal, &block)
+ Kernel.trap(signal, &block) unless Merb.disabled?(:signals)
+ end
+
end
end
lib/merb-core.rb
@@ -383,11 +383,11 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
@ran = true
$0 = "merb#{" : " + Merb::Config[:name] if Merb::Config[:name]} : master"
-
+
if Merb::Config[:fork_for_class_load] && Merb.env != "test"
start_transaction
else
- trap('INT') do
+ Merb.trap('INT') do
Merb.logger.warn! "Killing children"
kill_children
end
@@ -412,31 +412,31 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
Merb::Server.remove_pid("main")
exit
end
-
+
# If using fork-based code reloading, set up the BEGIN
# point and set up any signals in the parent and child.
def start_transaction
Merb.logger.warn! "Parent pid: #{Process.pid}"
reader, writer = nil, nil
-
+
if GC.respond_to?(:copy_on_write_friendly=)
GC.copy_on_write_friendly = true
- end
-
+ end
+
loop do
reader, @writer = IO.pipe
pid = Kernel.fork
-
+
# pid means we're in the parent; only stay in the loop in that case
break unless pid
@writer.close
Merb::Server.store_pid("main")
-
+
if Merb::Config[:console_trap]
- trap("INT") {}
+ Merb.trap("INT") {}
else
- trap("INT") do
+ Merb.trap("INT") do
Merb.logger.warn! "Killing children"
begin
Process.kill("ABRT", pid)
@@ -445,8 +445,8 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
exit_gracefully
end
end
-
- trap("HUP") do
+
+ Merb.trap("HUP") do
Merb.logger.warn! "Doing a fast deploy\n"
Process.kill("HUP", pid)
end
@@ -471,20 +471,20 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
end
end
end
-
+
reader.close
-
+
# add traps to the child
if Merb::Config[:console_trap]
Merb::Server.add_irb_trap
at_exit { kill_children }
else
- trap('INT') {}
- trap('ABRT') { kill_children }
- trap('HUP') { kill_children(128) }
+ Merb.trap('INT') {}
+ Merb.trap('ABRT') { kill_children }
+ Merb.trap('HUP') { kill_children(128) }
end
end
-
+
# Kill any children of the spawner process and exit with
# an appropriate status code.
#
lib/merb-core/bootloader.rb
@@ -97,7 +97,7 @@ module Merb
# we let the master process' ctrl-c control the cluster
# of workers.
if Merb::Config[:daemonize]
- trap('INT') do
+ Merb.trap('INT') do
stop
Merb.logger.warn! "Exiting port #{port}\n"
exit_process
@@ -105,19 +105,19 @@ module Merb
# If it was not fork_for_class_load, we already set up
# ctrl-c handlers in the master thread.
elsif Merb::Config[:fork_for_class_load]
- trap('INT') { 1 }
+ Merb.trap('INT') { 1 }
end
# In daemonized mode or not, support HUPing the process to
# restart it.
- trap('HUP') do
+ Merb.trap('HUP') do
stop
Merb.logger.warn! "Exiting port #{port} on #{Process.pid}\n"
exit_process
end
# ABRTing the process will kill it, and it will not be respawned.
- trap('ABRT') do
+ Merb.trap('ABRT') do
stopped = stop(128)
Merb.logger.warn! "Exiting port #{port}\n" if stopped
exit_process(128)
lib/merb-core/rack/adapter/abstract.rb
@@ -141,9 +141,9 @@ module Merb
rescue NotImplementedError => e
Merb.fatal! "Daemonized mode is not supported on your platform", e
end
-
+
def bootup
- trap('TERM') { exit }
+ Merb.trap('TERM') { exit }
puts "Running bootloaders..." if Merb::Config[:verbose]
BootLoader.run
@@ -290,12 +290,12 @@ module Merb
end
def add_irb_trap
- trap('INT') do
+ Merb.trap('INT') do
if @interrupted
puts "Exiting\n"
exit
end
-
+
@interrupted = true
puts "Interrupt a second time to quit"
Kernel.sleep 1.5
@@ -308,7 +308,7 @@ module Merb
IRB.conf[:MAIN_CONTEXT] = @irb.context
end
- trap(:INT) { @irb.signal_handle }
+ Merb.trap(:INT) { @irb.signal_handle }
catch(:IRB_EXIT) { @irb.eval_input }
puts "Exiting IRB mode, back in server mode"
lib/merb-core/server.rb
2d31e4b35f7698fc9667ccca5d5b3e9528486a90
Dudley Flanders
dudley@misnomer.us
http://github.com/wycats/merb-core/commit/fed193936802af5d3563acf1ba5c8f9f33a72351
fed193936802af5d3563acf1ba5c8f9f33a72351
2008-10-04T21:45:33-07:00
2008-10-04T20:23:32-07:00
Allow Merb.disable(:signals) to keep Merb from installing any signal handlers.
Signed-off-by: Yehuda Katz <wycats@gmail.com>
4deb3e9dfb7025e984e99624c12c6b2585c6ab52
Yehuda Katz
wycats@gmail.com