Merge pull request #111 from fishr01/hotfix-timeouts

Added an option to overwrite the default 10 seconds timeout
SparkPost · May 25, 2016 · 2ce8184 · 2ce8184
2 parents 0a06bd0 + 3afa56c
commit 2ce8184
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/examples/transmission/send_transmission_all_fields.php b/examples/transmission/send_transmission_all_fields.php
@@ -13,7 +13,7 @@
 use Ivory\HttpAdapter\Guzzle6HttpAdapter;
 
 $httpAdapter = new Guzzle6HttpAdapter(new Client());
-$sparky = new SparkPost($httpAdapter, ['key' => $config['api-key']]);
+$sparky = new SparkPost($httpAdapter, ['key' => $config['api-key'], 'timeout' => 0]]);
 
 $data = file_get_contents('/path/to/test.csv');
 

diff --git a/lib/SparkPost/SparkPost.php b/lib/SparkPost/SparkPost.php
@@ -35,6 +35,7 @@ class SparkPost
         'strictSSL' => true,
         'key' => '',
         'version' => 'v1',
+        'timeout' => 10
     ];
 
     /**
@@ -99,6 +100,7 @@ private function getHttpConfig($config)
         $httpConfig = new Configuration();
         $baseUrl = $config['protocol'].'://'.$config['host'].($config['port'] ? ':'.$config['port'] : '').'/api/'.$config['version'];
         $httpConfig->setBaseUri($baseUrl);
+        $httpConfig->setTimeout($this->config['timeout']);
         $httpConfig->setUserAgent('php-sparkpost/'.$this->version);
 
         return $httpConfig;