From d92b461dd9f5ff0eae7d15435aab1507dfb53496 Mon Sep 17 00:00:00 2001 From: jeg2 Date: Sat, 1 Dec 2007 16:01:49 +0000 Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@14070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/xmlrpc/server.rb | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8720ef52df..84f9c1e43b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 2 01:00:07 2007 James Edward Gray II + + * 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 * 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 -- cgit v1.2.3