Merge pull request #51 from vbcodeplicity/feature/API-5760-Expand-the-connect-timeout-exception

Expand curl_error exception handling with more details

Author: ppavlovic

src/Engine/Elasticsearch/ElasticsearchClient.php

@@ -248,7 +248,8 @@ private function submitCurlRequest()
         $error = curl_error($handle);
 
         if ($error) {
-            throw new ClientException(sprintf("Submit curl request failed. Error: %s", $error));
+            $errorCode = "Curl error number - ". curl_errno($handle);
+            $this->throwCurlException($errorCode, $error, $this->url, $this->body, null);
         }
 
         $info = curl_getinfo($handle);
@@ -264,15 +265,7 @@ private function submitCurlRequest()
         $this->profiler->end($uniqueId);
 
         if (isset($info['http_code']) && (int) $info['http_code'] >= 400 && (int) $info['http_code'] <= 599) {
-            throw new ClientException(
-                sprintf(
-                    "Unexpected response code:%s from ES has been returned on submit. More info: %s. Body: %s. Response: %s",
-                    $info['http_code'],
-                    json_encode($info),
-                    json_encode($this->body),
-                    is_array($response) ? json_encode($response) : $response
-                )
-            );
+            $this->throwCurlException($info['http_code'], $info, $this->url, $this->body, $response);
         }
 
         return $this;
@@ -292,4 +285,18 @@ public function getUrl()
     {
         return $this->url;
     }
+
+    private function throwCurlException($code, $message, $url, $body, $response)
+    {
+        throw new ClientException(
+            sprintf(
+                "Unexpected response code:%s from ES has been returned on submit. More info: %s. Url: %s. Body: %s. Response: %s",
+                $code,
+                json_encode($message),
+                json_encode($url),
+                json_encode($body),
+                is_array($response) ? json_encode($response) : $response
+            )
+        );
+    }
 }

tests/unit/src/Engine/Elasticsearch/ElasticsearchClientTest.php

@@ -2,6 +2,7 @@
 
 
 use G4\DataMapper\Engine\Elasticsearch\ElasticsearchClient;
+use G4\DataMapper\Exception\ClientException;
 use G4\ValueObject\Url;
 
 class ElasticsearchClientTest extends PHPUnit_Framework_TestCase
@@ -42,6 +43,14 @@ public function testGetUrl()
         $this->assertEquals($this->urlMock, $this->elasticsearchClient->getUrl());
     }
 
+    public function testCurlError()
+    {
+        $this->expectException(ClientException::class);
+        $this->expectExceptionMessage('Unexpected response code:Curl error number - 6 from ES has been returned on submit. More info: "Could not resolve host: nothing". Url: {}. Body: null. Response: ');
+        $elasticsearchClient = new ElasticsearchClient(new Url('http://nothing'), null, 5);
+        $elasticsearchClient->execute();
+    }
+
     protected function setUp()
     {
         $this->urlMock = $this->getMockBuilder(Url::class)