activeldap/activeldap@ebc28cb [master] net-ldap: use Net::LDAP::ResponseMissingOrInvalidError as connection error

1 view
Skip to first unread message

Kouhei Sutou

unread,
Apr 28, 2018, 5:28:15 PM4/28/18
to activeld...@googlegroups.com
Author
Kouhei Sutou <k...@clear-code.com>
Date
2018-04-29 06:27:24 +0900 (Sun, 29 Apr 2018)
New Revision
ebc28cbe59ef04eceaa26d3d51a635b710b922fe
Message
net-ldap: use Net::LDAP::ResponseMissingOrInvalidError as connection error
Modified files
  Modified: lib/active_ldap/adapter/net_ldap.rb (+7 -2)
===================================================================

...
151
152
153
154
155
 
 
 
 
 
 
 
156
157
158

...
151
152
153
 
 
154
155
156
157
158
159
160
161
162
163

@@ -151,8 +151,13 @@ module ActiveLdap
         result = log(name, info) do
           begin
             @connection.send(method, *args, &block)
-          rescue Errno::EPIPE, Errno::ECONNRESET
-            raise ConnectionError, "#{$!.class}: #{$!.message}"
+          rescue SystemCallError => error
+            message = "#{error.class}: #{error.message}"
+            raise ConnectionError, message, caller(0) + error.backtrace
+          rescue Net::LDAP::ResponseMissingOrInvalidError => error
+            message = "#{error.class}: #{error.message}"
+            message << ": connection may be timed out"
+            raise ConnectionError, message, caller(0) + error.backtrace
           end
         end
         message = nil
Reply all
Reply to author
Forward
0 new messages