summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan <fishr01@gmail.com>2016-05-19 23:02:50 +0200
committerRyan <fishr01@gmail.com>2016-05-19 23:02:50 +0200
commit3afa56c4073448d12d818fd0279d454b5cd98664 (patch)
tree151949bc24ab4b43bafdf7d40d30659f9b81ceab
parent6a3715fa492267fc2ef67f65a4dffbf2c85dec9f (diff)
downloadphp-sparkpost-3afa56c4073448d12d818fd0279d454b5cd98664.zip
php-sparkpost-3afa56c4073448d12d818fd0279d454b5cd98664.tar.gz
php-sparkpost-3afa56c4073448d12d818fd0279d454b5cd98664.tar.bz2
Added a timeout option to overwrite the default 10 seconds built into the default configuration
-rw-r--r--examples/transmission/send_transmission_all_fields.php2
-rw-r--r--lib/SparkPost/SparkPost.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/transmission/send_transmission_all_fields.php b/examples/transmission/send_transmission_all_fields.php
index 26cb96d..986fd87 100644
--- a/examples/transmission/send_transmission_all_fields.php
+++ b/examples/transmission/send_transmission_all_fields.php
@@ -13,7 +13,7 @@ use GuzzleHttp\Client;
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
index 8a53d5b..6c6bd57 100644
--- 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 @@ class SparkPost
$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;