whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [2/2] Commit 8649aa6: Merge branch 'master' of github.com:apache/whimsy
Date Fri, 22 Jan 2016 12:12:13 GMT
Commit 8649aa60ef0c9f98104b9c036ff7a74b102d11da:
    Merge branch 'master' of github.com:apache/whimsy


Branch: refs/heads/master
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
lib/whimsy/asf/ldap.rb                                       | ++++ ---
------------------------------------------------------------
7 changes: 4 additions, 3 deletions.
------------------------------------------------------------


diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 475a109..4c696e7 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -61,12 +61,13 @@ def self.connect
 
           return ldap
         rescue ::LDAP::ResultError => re
-          Wunderbar.error "Error connecting to LDAP server #{host}: " +
-            re.message
+          Wunderbar.warn "Error connecting to LDAP server #{host}: " +
+            re.message + " (continuing)"
         end
 
-        return nil
       end
+      Wunderbar.error "Failed to connect to any LDAP host"
+      return nil
     end
   end
 

Mime
View raw message