summaryrefslogtreecommitdiff
path: root/lib/webrick/server.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-14 02:30:43 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-14 02:30:43 +0000
commitc26ea74ad670be16cab2f38ec557d1d0505e5d39 (patch)
treeb4e4dfd532904e002c3dd4e3538e2d8cd53e902f /lib/webrick/server.rb
parente95f7ea80d096cf27ea0ae5f7dc712ad72e71f3c (diff)
* lib/webrick/server.rb (WEBrick::GenericServer#start):
partially revert r35315. * test/webrick/test_server.rb (test_start_exception): received signal is delivered to the main thread, so it is needed to emulate it. patched by Eric Hodel. [ruby-core:44348] [Feature #6236] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/server.rb')
-rw-r--r--lib/webrick/server.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index bd9dcb0..2eabf5d 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -133,12 +133,12 @@ module WEBrick
rescue Errno::EBADF, IOError => ex
# if the listening socket was closed in GenericServer#shutdown,
# IO::select raise it.
- rescue Interrupt => ex # ^C
- @logger.fatal ex
- raise
- rescue Exception => ex
+ rescue StandardError => ex
msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
@logger.error msg
+ rescue Exception => ex
+ @logger.fatal ex
+ raise
end
end