@@ -9,10 +9,10 @@ module Mongo @connected = false @on_close = proc{ - raise Error, 'could not connect to server' + raise Error, "could not connect to server #{opts[:host]}:#{opts[:port]}" } - timeout opts[:timeout] || 0.5 + timeout opts[:timeout] if opts[:timeout] errback{ @on_close.call } end @@ -69,7 +69,7 @@ module Mongo def unbind log 'disconnected' @connected = false - @on_close.call + @on_close.call unless $! end # connection lib/mongo/client.rb 20863cc1709296a55c4172b69a322b2c0fcfd8c0 Aman Gupta aman@tmm1.net http://github.com/tmm1/rmongo/commit/ac2003e4a7ee917568fd3636220b233d5b78ed57 ac2003e4a7ee917568fd3636220b233d5b78ed57 2008-08-24T22:41:18-07:00 2008-08-24T22:41:18-07:00 no default timeout; show host/port in error; no close callback if error state 44897152f5bce8aa853837d4184a565a7de6204c Aman Gupta aman@tmm1.net