Merge pull request influxdata#105 from brycefranzen/guzzle_connect_timeout

Add ability to specify connect_timeout for guzzle

Author: gianarb

src/InfluxDB/Client.php

@@ -48,6 +48,11 @@ class Client
      */
     protected $timeout = 0;
 
+    /**
+     * @var float
+     */
+    protected $connectTimeout = 0;
+
     /**
      * @var bool
      */
@@ -98,7 +103,8 @@ class Client
      * @param string $password
      * @param bool   $ssl
      * @param bool   $verifySSL
-     * @param int    $timeout
+     * @param float  $timeout
+     * @param float  $connectTimeout
      */
     public function __construct(
         $host,
@@ -107,13 +113,15 @@ public function __construct(
         $password = '',
         $ssl = false,
         $verifySSL = false,
-        $timeout = 0
+        $timeout = 0,
+        $connectTimeout = 0
     ) {
         $this->host = (string) $host;
         $this->port = (int) $port;
         $this->username = (string) $username;
         $this->password = (string) $password;
         $this->timeout = (float) $timeout;
+        $this->connectTimeout = (float) $connectTimeout;
         $this->verifySSL = (bool) $verifySSL;
 
         if ($ssl) {
@@ -252,13 +260,14 @@ public function listUsers()
      * udp+influxdb://username:pass@localhost:4444/databasename
      *
      * @param  string $dsn
-     * @param  int    $timeout
+     * @param  float  $timeout
      * @param  bool   $verifySSL
+     * @param  float  $connectTimeout
      *
      * @return Client|Database
      * @throws ClientException
      */
-    public static function fromDSN($dsn, $timeout = 0, $verifySSL = false)
+    public static function fromDSN($dsn, $timeout = 0, $verifySSL = false, $connectTimeout = 0)
     {
         $connParams = parse_url($dsn);
         $schemeInfo = explode('+', $connParams['scheme']);
@@ -285,7 +294,8 @@ public static function fromDSN($dsn, $timeout = 0, $verifySSL = false)
             isset($connParams['pass']) ? $connParams['pass'] : '',
             $ssl,
             $verifySSL,
-            $timeout
+            $timeout,
+            $connectTimeout
         );
 
         // set the UDP driver when the DSN specifies UDP
@@ -312,6 +322,14 @@ public function getTimeout()
         return $this->timeout;
     }
 
+    /**
+     * @return float
+     */
+    public function getConnectTimeout()
+    {
+        return $this->connectTimeout;
+    }
+
     /**
      * @return bool
      */
@@ -341,6 +359,7 @@ public function getDriver()
         $this->driver = new Guzzle(
             new \GuzzleHttp\Client(
                 [
+                    'connect_timeout' => $this->connectTimeout,
                     'timeout' => $this->timeout,
                     'base_uri' => $this->baseURI,
                     'verify' => $this->verifySSL