Merge pull request #127 from pantheon-systems/fix-commit-within

Fix commit within and a couple of related fixes.
pantheon-systems · Nov 17, 2021 · 8755a5d · 8755a5d
2 parents 2a58bc8 + 4fd49c7
commit 8755a5d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/Plugin/SolrConnector/PantheonSolrConnector.php b/src/Plugin/SolrConnector/PantheonSolrConnector.php
@@ -87,6 +87,8 @@ public function __construct(
     $this->dateFormatter = $date_formatter;
     $this->messenger = $messenger;
     $this->setLogger($logger_factory->get('PantheonSearch'));
+    $this->configuration['core'] = getenv('PANTHEON_INDEX_CORE');
+    $this->configuration['schema'] = getenv('PANTHEON_INDEX_SCHEMA');
     $this->connect();
   }
 
@@ -129,6 +131,7 @@ public function defaultConfiguration() {
           'core' => getenv('PANTHEON_INDEX_CORE'),
           'schema' => getenv('PANTHEON_INDEX_SCHEMA'),
           'solr_version' => '8',
+          'commit_within' => 1000,
       ]);
   }
 
@@ -180,7 +183,9 @@ public function submitConfigurationForm(
         array &$form,
         FormStateInterface $form_state
     ) {
-    $this->setConfiguration($form_state->getValues());
+    $configuration = $form_state->getValues();
+    $configuration = array_merge($this->defaultConfiguration(), $configuration);
+    $this->setConfiguration($configuration);
   }
 
   /**

diff --git a/src/Services/Endpoint.php b/src/Services/Endpoint.php
@@ -44,18 +44,17 @@ class Endpoint extends SolariumEndpoint {
    *   they are used by other functions of the endpoint.
    */
   public function __construct(array $options = []) {
-    if (!$options) {
-      $options = [
-            'scheme' => getenv('PANTHEON_INDEX_SCHEME'),
-            'host' => getenv('PANTHEON_INDEX_HOST'),
-            'port' => getenv('PANTHEON_INDEX_PORT'),
-            'path' => getenv('PANTHEON_INDEX_PATH'),
-            'core' => getenv('PANTHEON_INDEX_CORE'),
-            'schema' => getenv('PANTHEON_INDEX_SCHEMA'),
-            'collection' => NULL,
-            'leader' => FALSE,
-        ];
-    }
+    // We intentionally want to override this options in case they are set in the parameter.
+    $options = array_merge($options, [
+      'scheme' => getenv('PANTHEON_INDEX_SCHEME'),
+      'host' => getenv('PANTHEON_INDEX_HOST'),
+      'port' => getenv('PANTHEON_INDEX_PORT'),
+      'path' => getenv('PANTHEON_INDEX_PATH'),
+      'core' => getenv('PANTHEON_INDEX_CORE'),
+      'schema' => getenv('PANTHEON_INDEX_SCHEMA'),
+      'collection' => NULL,
+      'leader' => FALSE,
+    ]);
     parent::__construct($options);
   }