Fix sync user from ldap in cli mode consumes ram

pydio · Apr 12, 2017 · 30b0a07 · 30b0a07
1 parent c9cbf45
commit 30b0a07
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/core/src/core/src/pydio/Core/Services/ApplicationState.php b/core/src/core/src/pydio/Core/Services/ApplicationState.php
@@ -47,6 +47,11 @@ class ApplicationState
      */
     private static $minisiteHash = null;
 
+    /**
+     * @var bool
+     */
+    public static $silenceInstantMessages = false;
+
     /**
      * @param string $restBase
      */

diff --git a/core/src/core/src/pydio/Core/Services/UsersService.php b/core/src/core/src/pydio/Core/Services/UsersService.php
@@ -127,7 +127,9 @@ public static function updateUser($userObject, $scope = "user"){
             CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:" . $userId, $userObject);
         }else{
             CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:" . $userId, $userObject);
-            Controller::applyHook("msg.instant", array(Context::contextWithObjects($userObject, null), ReloadRepoListMessage::XML(), $userObject->getId()));
+            if(!ApplicationState::$silenceInstantMessages) {
+                Controller::applyHook("msg.instant", array(Context::contextWithObjects($userObject, null), ReloadRepoListMessage::XML(), $userObject->getId()));
+            }
         }
     }
 

diff --git a/core/src/plugins/access.ajxp_conf/src/UsersManager.php b/core/src/plugins/access.ajxp_conf/src/UsersManager.php
@@ -602,6 +602,7 @@ public function usersActions(ServerRequestInterface $requestInterface, ResponseI
                 // Action for updating all Pydio's user from ldap in CLI mode
                 if((php_sapi_name() == "cli")){
                     // TODO : UPGRADE THIS TO NEW CLI FORMAT
+                    ApplicationState::$silenceInstantMessages = true;
                     $progressBar = new ProgressBarCLI();
                     $countCallback  = array($progressBar, "init");
                     $loopCallback   = array($progressBar, "update");