summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-03-31 13:10:42 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-03-31 13:10:42 (GMT)
commitc43040e4e1af09dd05db8c6e15668d034a8bc1ab (patch)
tree159b1cfd209f68f90f43b50ae662c9d9a1c0a5e8
parentae6ec80e446450b395bf47b484b91d07ab28fdc7 (diff)
downloadroundcubemail-plugins-kolab-c43040e4e1af09dd05db8c6e15668d034a8bc1ab.tar.gz
Increase default timeout for Bonnie API requests
-rw-r--r--plugins/libkolab/config.inc.php.dist1
-rw-r--r--plugins/libkolab/lib/kolab_bonnie_api.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/libkolab/config.inc.php.dist b/plugins/libkolab/config.inc.php.dist
index 82f679e..a2c15e8 100644
--- a/plugins/libkolab/config.inc.php.dist
+++ b/plugins/libkolab/config.inc.php.dist
@@ -71,4 +71,5 @@ $config['kolab_bonnie_api'] = array(
'pass' => 'Welcome2KolabSystems',
'secret' => '8431f191707fffffff00000000cccc',
'debug' => true, // logs requests/responses to <log-dir>/bonnie
+ 'timeout' => 30,
);
diff --git a/plugins/libkolab/lib/kolab_bonnie_api.php b/plugins/libkolab/lib/kolab_bonnie_api.php
index a243cce..6905dca 100644
--- a/plugins/libkolab/lib/kolab_bonnie_api.php
+++ b/plugins/libkolab/lib/kolab_bonnie_api.php
@@ -38,7 +38,7 @@ class kolab_bonnie_api
{
$this->config = $config;
- $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 5, (bool)$config['debug']);
+ $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 30, (bool)$config['debug']);
$this->client->set_secret($config['secret']);
$this->client->set_authentication($config['user'], $config['pass']);