diff options
| author | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-01 16:01:49 +0000 |
|---|---|---|
| committer | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-01 16:01:49 +0000 |
| commit | 94ee755c68b40358564445e9034929d34e5d0c9e (patch) | |
| tree | 79b28e71b11b770e16e3b8ba9c0d1a1cd58f5060 /lib/xmlrpc | |
| parent | 48ee1ad5e5332c43880df966c687b0867c12fe29 (diff) | |
| download | ruby-94ee755c68b40358564445e9034929d34e5d0c9e.tar.gz ruby-94ee755c68b40358564445e9034929d34e5d0c9e.tar.xz ruby-94ee755c68b40358564445e9034929d34e5d0c9e.zip | |
* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
pressing control-c in the controlling terminal or sending SIGTERM stops
the XML-RPC server.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/xmlrpc')
| -rw-r--r-- | lib/xmlrpc/server.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb index 59a586940..ca8d3b0a5 100644 --- a/lib/xmlrpc/server.rb +++ b/lib/xmlrpc/server.rb @@ -639,11 +639,11 @@ class Server < WEBrickServlet def serve if RUBY_PLATFORM =~ /mingw|mswin32/ - signal = 1 + signals = [1] else - signal = "HUP" + signals = %w[INT TERM HUP] end - trap(signal) { @server.shutdown } + signals.each { |signal| trap(signal) { @server.shutdown } } @server.start end |