Merge pull request #118 from bakaphp/0.6-update-elastci-error-reporting

[0.6] Improve Elastic Error Reporting
bakaphp · Apr 27, 2021 · e87b398 · e87b398
2 parents a1a1846 + 69b0045
commit e87b398
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Elasticsearch/Query.php b/src/Elasticsearch/Query.php
@@ -7,6 +7,7 @@
 use Baka\Elasticsearch\Query\FromClause;
 use function Baka\envValue;
 use Baka\Exception\Exception;
+use Baka\Exception\HttpException;
 use Phalcon\Di;
 use Phalcon\Mvc\Model\Query\Builder;
 use SplFixedArray;
@@ -65,8 +66,14 @@ public function find() : array
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 
+        $results = curl_exec($ch);
+        if (!$results) {
+            $message = 'Elastic error: ' . curl_error($ch);
+            throw new HttpException($message, 500);
+        }
+
         // Send request.
-        $results = json_decode(curl_exec($ch), true);
+        $results = json_decode($results, true);
 
         if (isset($results['error'])) {
             throw  Exception::create(