wip

wbstack · Aug 12, 2021 · 34eada0 · 34eada0
1 parent 0383f1c
commit 34eada0
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 346 deletions.
diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php
@@ -80,13 +80,13 @@ public function create(Request $request): \Illuminate\Http\Response
                 'value' => Str::random(64),
             ]);
 
-            // Enable elasticsearch for new wikis by default
+            // Create elasticsearch setting to be updated once ElasticSearch has been initialized
             // T285541
-//             WikiSetting::create([
-//                 'wiki_id' => $wiki->id,
-//                 'name' => 'wwExtEnableElasticSearch',
-//                 'value' => true,
-//             ]);
+            WikiSetting::create([
+                'wiki_id' => $wiki->id,
+                'name' => 'wwExtEnableElasticSearch',
+                'value' => false,
+            ]);
 
             // Also track the domain forever in your domains table
             $wikiDomain = WikiDomain::create([
@@ -117,7 +117,8 @@ public function create(Request $request): \Illuminate\Http\Response
         $this->dispatch(new ProvisionWikiDbJob(null, null, 10));
         $this->dispatch(new ProvisionQueryserviceNamespaceJob(null, 10));
 
-//        $this->dispatch(new ElasticSearchIndexInit($wiki->domain));
+        // dispatch elasticsearch init job to enable the feature
+        $this->dispatch(new ElasticSearchIndexInit($wiki->domain, $wiki->id));
 
         $res['success'] = true;
         $res['message'] = 'Success!';

diff --git a/app/Jobs/ElasticSearchIndexInit.php b/app/Jobs/ElasticSearchIndexInit.php
@@ -2,17 +2,20 @@
 
 namespace App\Jobs;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
+use App\WikiSetting;
 
 class ElasticSearchIndexInit extends Job implements ShouldBeUnique
 {
     private $wikiDomain;
+    private $wikiId;
 
     /**
      * @return void
      */
-    public function __construct($wikiDomain)
+    public function __construct( $wikiDomain, $wikiId )
     {
         $this->wikiDomain = $wikiDomain;
+        $this->wikiId = $wikiId;
     }
 
     /**
@@ -30,6 +33,17 @@ public function uniqueId()
      */
     public function handle()
     {
+        $setting = WikiSetting::where([ 'wiki_id' => $this->wikiId, 'name' => WikiSetting::wwExtEnableElasticSearch, ])->first();
+
+        // job got triggered but no setting in database
+        if ( $setting === null ) {
+            $this->fail(
+                new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiDomain.' was triggered but not setting available.')
+            );
+
+            return;
+        }
+
         $curl = curl_init();
         curl_setopt_array($curl, [
             CURLOPT_URL => getenv('PLATFORM_MW_BACKEND_HOST').'/w/api.php?action=wbstackElasticSearchInit&format=json',
@@ -63,15 +77,37 @@ public function handle()
                 new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiDomain.'. No wbstackElasticSearchInit key in response: '.$rawResponse)
             );
 
-            return; //safegaurd
+            return;
         }
 
         if ($response['wbstackElasticSearchInit']['success'] == 0) {
             $this->fail(
                 new \RuntimeException('wbstackElasticSearchInit call for '.$this->wikiDomain.' was not successful:'.$rawResponse)
             );
 
-            return; //safegaurd
+            return;
         }
+
+        $output = $response['wbstackElasticSearchInit']['output'];
+
+        $newlyCreatedOutput = "\tCreating index...ok"; // occurs a couple of times when newly created
+        $updated = "\t\tValidating {$this->wikiDomain}_general alias...ok"; // occurs on a successful update run
+
+        if ( in_array( $newlyCreatedOutput,  $output ) ) {
+            // newly created index succeeded, turn on the wiki setting
+            $setting->update(
+                [ 
+                    'value' => true 
+                ]
+            );
+        } else if ( !in_array( $updated, $output ) ) {
+            // it did not even succeed in updating, disable the setting on the wiki
+            $setting->update(
+                [ 
+                    'value' => false 
+                ]
+            );
+        }
+
     }
 }
diff --git a/app/Observers/ElasticSearchWikiSettingsObserver.php b/app/Observers/ElasticSearchWikiSettingsObserver.php
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -29,6 +29,5 @@ class EventServiceProvider extends ServiceProvider
     public function boot()
     {
         parent::boot();
-        WikiSetting::observe(ElasticSearchWikiSettingsObserver::class);
     }
 }