tweak(TB User LdapAd) tweak backend retry behavior

tine-groupware · Sep 26, 2024 · 59325c0 · 59325c0
1 parent cf82079
commit 59325c0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tine20/Tinebase/User.php b/tine20/Tinebase/User.php
@@ -252,7 +252,7 @@ public static function factory($backendType)
         if ((self::ACTIVEDIRECTORY === $backendType || self::LDAP === $backendType)
                 && Tinebase_Config::getInstance()->{Tinebase_Config::USERBACKEND}->{Tinebase_Config::SYNCOPTIONS}->{Tinebase_Config::SYNC_USER_OF_GROUPS}
                 && ($unavailableSince = Tinebase_Config::getInstance()->USERBACKEND_UNAVAILABLE_SINCE)) {
-            if (time() - $unavailableSince < 60) {
+            if (time() - $unavailableSince < 60 * 15) {
                 $backendType = self::SQL;
             }
         }
@@ -289,7 +289,10 @@ public static function factory($backendType)
             }
         } catch (Tinebase_Exception_Backend_Ldap $e) {
             if (Tinebase_Config::getInstance()->{Tinebase_Config::USERBACKEND}->{Tinebase_Config::SYNCOPTIONS}->{Tinebase_Config::SYNC_USER_OF_GROUPS}) {
-                Tinebase_Config::getInstance()->USERBACKEND_UNAVAILABLE_SINCE = time();
+                Tinebase_Config::getInstance()->clearCache();
+                try {
+                    Tinebase_Config::getInstance()->USERBACKEND_UNAVAILABLE_SINCE = time();
+                } catch (Exception) {}
                 return self::factory(self::SQL);
             } else {
                 throw $e;