Signed-off-by: Robin Appelman <robin@icewind.nl>tags/v14.0.0beta1
@@ -597,6 +597,7 @@ return array( | |||
'OC\\DB\\QueryBuilder\\QueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/QueryBuilder.php', | |||
'OC\\DB\\QueryBuilder\\QueryFunction' => $baseDir . '/lib/private/DB/QueryBuilder/QueryFunction.php', | |||
'OC\\DB\\QueryBuilder\\QuoteHelper' => $baseDir . '/lib/private/DB/QueryBuilder/QuoteHelper.php', | |||
'OC\\DB\\ReconnectWrapper' => $baseDir . '/lib/private/DB/ReconnectWrapper.php', | |||
'OC\\DB\\SQLiteMigrator' => $baseDir . '/lib/private/DB/SQLiteMigrator.php', | |||
'OC\\DB\\SQLiteSessionInit' => $baseDir . '/lib/private/DB/SQLiteSessionInit.php', | |||
'OC\\DB\\SchemaWrapper' => $baseDir . '/lib/private/DB/SchemaWrapper.php', |
@@ -627,6 +627,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\DB\\QueryBuilder\\QueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryBuilder.php', | |||
'OC\\DB\\QueryBuilder\\QueryFunction' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryFunction.php', | |||
'OC\\DB\\QueryBuilder\\QuoteHelper' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QuoteHelper.php', | |||
'OC\\DB\\ReconnectWrapper' => __DIR__ . '/../../..' . '/lib/private/DB/ReconnectWrapper.php', | |||
'OC\\DB\\SQLiteMigrator' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteMigrator.php', | |||
'OC\\DB\\SQLiteSessionInit' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteSessionInit.php', | |||
'OC\\DB\\SchemaWrapper' => __DIR__ . '/../../..' . '/lib/private/DB/SchemaWrapper.php', |
@@ -43,7 +43,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; | |||
use OCP\IDBConnection; | |||
use OCP\PreConditionNotMetException; | |||
class Connection extends \Doctrine\DBAL\Connection implements IDBConnection { | |||
class Connection extends ReconnectWrapper implements IDBConnection { | |||
/** | |||
* @var string $tablePrefix | |||
*/ |
@@ -0,0 +1,52 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl> | |||
* | |||
* @license GNU AGPL version 3 or any later version | |||
* | |||
* This program is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License as | |||
* published by the Free Software Foundation, either version 3 of the | |||
* License, or (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
* | |||
*/ | |||
namespace OC\DB; | |||
use Doctrine\Common\EventManager; | |||
use Doctrine\DBAL\Configuration; | |||
use Doctrine\DBAL\Driver; | |||
class ReconnectWrapper extends \Doctrine\DBAL\Connection { | |||
const CHECK_CONNECTION_INTERVAL = 60; | |||
private $lastConnectionCheck = null; | |||
public function __construct(array $params, Driver $driver, Configuration $config = null, EventManager $eventManager = null) { | |||
parent::__construct($params, $driver, $config, $eventManager); | |||
$this->lastConnectionCheck = time(); | |||
} | |||
public function connect() { | |||
$now = time(); | |||
$checkTime = $now - self::CHECK_CONNECTION_INTERVAL; | |||
if ($this->lastConnectionCheck > $checkTime || $this->isTransactionActive()) { | |||
return parent::connect(); | |||
} else { | |||
$this->lastConnectionCheck = $now; | |||
if (!$this->ping()) { | |||
$this->close(); | |||
} | |||
return parent::connect(); | |||
} | |||
} | |||
} |