Merge pull request #148 from silinternational/develop

Release 4.4.0 Create one error message for all update-failed users
silinternational · Jun 12, 2023 · e0638eb · e0638eb
2 parents faa0e78 + 8daf6c4
commit e0638eb
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/application/common/sync/Synchronizer.php b/application/common/sync/Synchronizer.php
@@ -137,22 +137,32 @@ protected function activateAndUpdateUser(User $user)
      */
     protected function activateAndUpdateUsers(array $usersToUpdateAndActivate)
     {
+        $usersWithErrors = [];
+        $lastError = null;
+
         $employeeIdsOfUsersUpdated = [];
-        foreach ($usersToUpdateAndActivate as $userToUpdateAndActivate) {
+        foreach ($usersToUpdateAndActivate as $nextUser) {
             try {
-                $this->activateAndUpdateUser($userToUpdateAndActivate);
-                $employeeIdsOfUsersUpdated[] = $userToUpdateAndActivate->getEmployeeId();
+                $this->activateAndUpdateUser($nextUser);
+                $employeeIdsOfUsersUpdated[] = $nextUser->getEmployeeId();
             } catch (Exception $e) {
-                $this->logger->error(sprintf(
-                    'Failed to update/activate user in the ID Broker (%s). Error %s: %s. [%s]',
-                    $userToUpdateAndActivate->getStringForLogMessage(),
-                    $e->getCode(),
-                    $e->getMessage(),
-                    1494360119
-                ));
+                $usersWithErrors[] = $nextUser->getStringForLogMessage();
+                $lastError = $e;
             }
         }
 
+        if ($lastError !== null) {
+            $this->logger->error(sprintf(
+                'Failed to update/activate user(s) in the ID Broker. Last error %s: %s. [%s].'
+                . '  Failed for %s users, including: %s',
+                $lastError->getCode(),
+                $lastError->getMessage(),
+                1494360119,
+                count($usersWithErrors),
+                join(', ', array_slice($usersWithErrors, -6)) // last six users
+            ));
+        }
+
         $this->logger->notice([
             'action' => 'update',
             'attempted' => count($usersToUpdateAndActivate),