Merge pull request #11986 from nanaya/es-index-message

Fix es document reindex output

Author: notbakaneko

Diff for: app/Console/Commands/EsIndexDocuments.php

@@ -104,20 +104,21 @@ private function indexGroup($name)
 
         foreach ($types as $type) {
             $bar = $this->output->createProgressBar();
+            $bar->setFormat(' %current% [%bar%] %message%');
 
             $this->info("{$pretext} {$type} into {$indexName}");
 
+            $progressCallback = function ($progress, $message) use ($bar) {
+                $bar->setMessage($message);
+                $bar->setProgress($progress);
+            };
             if (!$this->inplace && $type === $first) {
                 // create new index if the first type for this index, otherwise
                 // index in place.
-                $type::esIndexIntoNew(Es::CHUNK_SIZE, $indexName, function ($progress) use ($bar) {
-                    $bar->setProgress($progress);
-                });
+                $type::esIndexIntoNew(Es::CHUNK_SIZE, $indexName, $progressCallback);
             } else {
                 $options = ['index' => $indexName];
-                $type::esReindexAll(Es::CHUNK_SIZE, 0, $options, function ($progress) use ($bar) {
-                    $bar->setProgress($progress);
-                });
+                $type::esReindexAll(Es::CHUNK_SIZE, 0, $options, $progressCallback);
             }
 
             $bar->finish();

Diff for: app/Console/Commands/EsIndexWiki.php

@@ -136,10 +136,13 @@ private function reindex()
         $total = count($paths);
         $this->line("Total: {$total} documents");
         $bar = $this->output->createProgressBar($total);
+        $bar->setFormat(' %current% [%bar%] %message%');
+        $logger = fn ($message) => $bar->setMessage($message);
 
         foreach ($paths as $path => $_inEs) {
             $pagePath = Page::parsePagePath($path);
             $page = new Page($pagePath['path'], $pagePath['locale']);
+            $page->logger = $logger;
             $page->sync(true, $this->indexName);
 
             if (!$page->isVisible()) {

Diff for: app/Models/Traits/Es/BaseDbIndexable.php

@@ -46,6 +46,7 @@ public static function esReindexAll($batchSize = 1000, $fromId = 0, array $optio
 
         $baseQuery = static::esIndexingQuery()->where($dummy->getKeyName(), '>', $fromId);
         $count = 0;
+        $progress ??= fn ($count, $message) => \Log::info(static::class.' '.$message);
 
         $baseQuery->chunkById($batchSize, function ($models) use ($options, &$count, $progress) {
             $actions = Es::generateBulkActions($models);
@@ -60,14 +61,12 @@ public static function esReindexAll($batchSize = 1000, $fromId = 0, array $optio
                 $count += count($result['items']);
             }
 
-            Log::info(static::class." next: {$models->last()->getKey()}");
-            if ($progress) {
-                $progress($count);
-            }
+            $progress($count, "next: {$models->last()->getKey()}");
         });
 
         $duration = time() - $startTime;
-        Log::info(static::class." Indexed {$count} records in {$duration} s.");
+
+        $progress($count, $message = "Indexed {$count} records in {$duration} s.");
     }
 
     /**

Diff for: app/Models/Wiki/Page.php

@@ -21,7 +21,6 @@
 use Carbon\Carbon;
 use Ds\Set;
 use Exception;
-use Log;
 
 class Page implements WikiObject
 {
@@ -41,6 +40,7 @@ class Page implements WikiObject
     ];
 
     public $locale;
+    public \Closure $logger;
     public $path;
     public $requestedLocale;
 
@@ -459,6 +459,12 @@ public function title($withSubtitle = false)
 
     private function log($action)
     {
-        Log::info("wiki ({$action}): {$this->pagePath()}");
+        $message = "wiki ({$action}): {$this->pagePath()}";
+
+        if (isset($this->logger)) {
+            ($this->logger)($message);
+        } else {
+            \Log::info($message);
+        }
     }
 }