diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/drb/drb.rb | 22 |
2 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Sun Feb 28 20:23:36 2016 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> + + * lib/drb/drb.rb (error_print): Add verbose failure messages and + avoid infamous DRb::DRbConnError. [Feature #12101] + Sun Feb 28 13:40:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * error.c (nometh_err_initialize): add private_call? parameter. diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 8011660156..d04ab3564d 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1632,6 +1632,17 @@ module DRb include InvokeMethod18Mixin end + def error_print(exception) + exception.backtrace.inject(true) do |first, x| + if first + $stderr.puts "#{x}: #{exception} (#{exception.class})" + else + $stderr.puts "\tfrom #{x}" + end + false + end + end + # The main loop performed by a DRbServer's internal thread. # # Accepts a connection from a client, and starts up its own @@ -1655,13 +1666,10 @@ module DRb succ = false invoke_method = InvokeMethod.new(self, client) succ, result = invoke_method.perform - if !succ && verbose - p result - result.backtrace.each do |x| - puts x - end - end - client.send_reply(succ, result) rescue nil + error_print(result) if !succ && verbose + client.send_reply(succ, result) + rescue Exception => e + error_print(e) if verbose ensure client.close unless succ if Thread.current['DRb']['stop_service'] |