Merge branch 'MDL-53271-master' of git://github.com/merrill-oakland/m…

…oodle
fladi · Mar 9, 2016 · 4f9303c · 4f9303c
2 parents c17e003 + 63d5007
commit 4f9303c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
@@ -309,6 +309,10 @@ public function add_document($doc) {
             $result = $this->get_search_client()->addDocument($solrdoc, true, static::AUTOCOMMIT_WITHIN);
         } catch (\SolrClientException $e) {
             debugging('Solr client error adding document with id ' . $doc['id'] . ': ' . $e->getMessage(), DEBUG_DEVELOPER);
+        } catch (\SolrServerException $e) {
+            // We only use the first line of the message, as it's a fully java stacktrace behind it.
+            $msg = strtok($e->getMessage(), "\n");
+            debugging('Solr server error adding document with id ' . $doc['id'] . ': ' . $msg, DEBUG_DEVELOPER);
         }
     }