diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-01-05 11:41:06 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-01-06 13:46:55 +0100 |
| commit | 553a981980571930a935a2e85895396f2813ae44 (patch) | |
| tree | 60123f26be6f6303ce90860d82d34f97c9cbbda2 /apps | |
| parent | 12b0e9e3bdd6de2d35165a52072d534c7c2f5fc2 (diff) | |
| download | nextcloud-server-553a981980571930a935a2e85895396f2813ae44.tar.gz nextcloud-server-553a981980571930a935a2e85895396f2813ae44.zip | |
Make LDAP more robust to exceptions and log them properly
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/lib/user/user.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 0dc3c8c0c26..7a121920a35 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -474,8 +474,8 @@ class User { $this->fs->setup($this->uid); } - $avatar = $this->avatarManager->getAvatar($this->uid); try { + $avatar = $this->avatarManager->getAvatar($this->uid); $avatar->set($this->image); } catch (\Exception $e) { \OC::$server->getLogger()->notice( diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index a266be7b7f7..c568905f3d9 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -118,6 +118,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn try { $ldapRecord = $this->getLDAPUserByLoginName($uid); } catch(\Exception $e) { + \OC::$server->getLogger()->logException($e, ['app' => 'user_ldap']); return false; } $dn = $ldapRecord['dn'][0]; |