diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/xmlrpc/server.rb | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Dec 2 01:00:07 2007 James Edward Gray II <jeg2@ruby-lang.org> + + * 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. + Sat Dec 1 23:04:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * encoding.c: rename primary_encoding -> default_external (encoding). diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb index 59a5869408..ca8d3b0a5b 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 |