jenkins-bot has submitted this change and it was merged.

Change subject: forceRenameUsers: log some more output, add missing \n
......................................................................


forceRenameUsers: log some more output, add missing \n

Change-Id: I7e4f1d9e037485abb61cd83da7e16d367bfda55b
---
M maintenance/forceRenameUsers.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/forceRenameUsers.php b/maintenance/forceRenameUsers.php
index 7803f4d..449e314 100644
--- a/maintenance/forceRenameUsers.php
+++ b/maintenance/forceRenameUsers.php
@@ -42,7 +42,7 @@
                        CentralAuthUser::waitForSlaves();
                        $count = $this->getCurrentRenameCount( $dbw );
                        while ( $count > 50 ) {
-                               $this->output( "There are currently $count 
renames queued, pausing..." );
+                               $this->output( "There are currently $count 
renames queued, pausing...\n" );
                                sleep( 5 );
                                $count = $this->getCurrentRenameCount( $dbw );
                        }
@@ -63,7 +63,7 @@
                $wiki = $row->utr_wiki;
                $name = $row->utr_name;
                $newNamePrefix = "$name~$wiki";
-               $this->output( "Beginning rename of $newNamePrefix" );
+               $this->log( "Beginning rename of $newNamePrefix" );
                $newCAUser = new CentralAuthUser( $newNamePrefix );
                $count = 0;
                // Edge case: Someone created User:Foo~wiki manually.
@@ -74,7 +74,7 @@
                        $newCAUser = new CentralAuthUser( $newNamePrefix . 
(string)$count );
                }
                if ( $newNamePrefix !== $newCAUser->getName() ) {
-                       $this->output( "WARNING: New name is now 
{$newCAUser->getName()}" );
+                       $this->log( "WARNING: New name is now 
{$newCAUser->getName()}" );
                }
                $this->log( "Renaming $name to {$newCAUser->getName()}." );
 
@@ -125,11 +125,11 @@
                foreach ( $rows as $row ) {
                        $caUser = new CentralAuthUser( $row->utr_name );
                        if ( $caUser->attachedOn( $row->utr_wiki ) ) {
-                               $this->output( "'{row->utr_name}' has become 
attached to a global account since the list as last generated." );
+                               $this->log( "'{row->utr_name}' has become 
attached to a global account since the list as last generated." );
                                $updates->remove( $row->utr_name, 
$row->utr_wiki );
                        } elseif ( !User::isUsableName( $row->utr_name ) ) {
                                // Reserved for a system account, ignore
-                               $this->output( "'{row->utr_name}' is a reserved 
username, skipping." );
+                               $this->log( "'{row->utr_name}' is a reserved 
username, skipping." );
                                $updates->remove( $row->utr_name, 
$row->utr_wiki );
                        } else {
                                $rowsToRename[] = $row;

-- 
To view, visit https://gerrit.wikimedia.org/r/204222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e4f1d9e037485abb61cd83da7e16d367bfda55b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to