return an error from ldap_search (#4623)

This will return the error from the ldap_search ran in Models/Ldap.php instead of throwing an exception. Users seem to commonly be getting an Exception because of invalid search filters. This will better inform them of that issue without requiring them to enable DEBUG.
2017-12-14 14:57:43 -06:00
parent f1a911d305
commit 9a40e5e651
1 changed files with 11 additions and 2 deletions
@@ -67,8 +67,17 @@ class LdapSync extends Command

        $summary = array();

-        $results = Ldap::findLdapUsers();
-
+	try {    
+            $results = Ldap::findLdapUsers();
+	} catch (\Exception $e) {
+	    if ($this->option('json_summary')) {
+                $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
+                $this->info(json_encode($json_summary));
+            }
+            LOG::error($e);
+            return [];
+        }
+	    
        // Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
        $ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
        $ldap_ou_lengths = array();