Clean up some external-groups log message formatting

silinternational · Sep 4, 2024 · cbc532f · cbc532f
1 parent aa20567
commit cbc532f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/application/common/components/ExternalGroupsSync.php b/application/common/components/ExternalGroupsSync.php
@@ -37,8 +37,8 @@ public static function syncAllSets(array $syncSetsParams)
                 ));
             } else {
                 Yii::warning(sprintf(
-                    'Syncing %s external groups from Google Sheet (%s)...',
-                    json_encode($appPrefix),
+                    "Syncing '%s' external groups from Google Sheet (%s)...",
+                    $appPrefix,
                     $googleSheetId
                 ));
                 self::syncSet($appPrefix, $googleSheetId);
@@ -51,7 +51,7 @@ private static function syncSet(string $appPrefix, string $googleSheetId)
         $desiredExternalGroups = self::getExternalGroupsFromGoogleSheet($googleSheetId);
         $errors = User::syncExternalGroups($appPrefix, $desiredExternalGroups);
         Yii::warning(sprintf(
-            'Ran sync for %s external groups.',
+            "Ran sync for '%s' external groups.",
             $appPrefix
         ));
 

diff --git a/application/common/models/User.php b/application/common/models/User.php
@@ -1060,9 +1060,9 @@ public static function syncExternalGroups(string $appPrefix, array $desiredExter
             $successful = $user->updateExternalGroups($appPrefix, $groupsForPrefix);
             if (! $successful) {
                 $errors[] = sprintf(
-                    "Failed to update external groups for %s: \n%s",
+                    'Failed to update external groups for %s: %s',
                     $email,
-                    json_encode($user->getFirstErrors(), JSON_PRETTY_PRINT)
+                    join(' / ', $user->getFirstErrors())
                 );
             }
         }
@@ -1082,9 +1082,9 @@ public function updateExternalGroups(string $appPrefix, string $csvAppExternalGr
             if (! str_starts_with($appExternalGroup, $appPrefix . '-')) {
                 $this->addErrors([
                     'groups_external' => sprintf(
-                        'The given group %s does not start with the given prefix (%s)',
-                        json_encode($appExternalGroup),
-                        json_encode($appPrefix)
+                        'The given group (%s) does not start with the given prefix (%s)',
+                        $appExternalGroup,
+                        $appPrefix
                     ),
                 ]);
                 return false;