dbal now handles it's own reconnections: https://github.com/doctrine/dbal/blob/3.0.x/UPGRADE.md#the-pingableconnection-interface-is-removed Signed-off-by: Robin Appelman <robin@icewind.nl>tags/v22.0.0beta1
@@ -992,7 +992,6 @@ 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\\ResultAdapter' => $baseDir . '/lib/private/DB/ResultAdapter.php', | |||
'OC\\DB\\SQLiteMigrator' => $baseDir . '/lib/private/DB/SQLiteMigrator.php', | |||
'OC\\DB\\SQLiteSessionInit' => $baseDir . '/lib/private/DB/SQLiteSessionInit.php', |
@@ -1021,7 +1021,6 @@ 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\\ResultAdapter' => __DIR__ . '/../../..' . '/lib/private/DB/ResultAdapter.php', | |||
'OC\\DB\\SQLiteMigrator' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteMigrator.php', | |||
'OC\\DB\\SQLiteSessionInit' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteSessionInit.php', |
@@ -53,7 +53,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; | |||
use OCP\ILogger; | |||
use OCP\PreConditionNotMetException; | |||
class Connection extends ReconnectWrapper { | |||
class Connection extends \Doctrine\DBAL\Connection { | |||
/** @var string */ | |||
protected $tablePrefix; | |||
@@ -172,6 +172,9 @@ class Connection extends ReconnectWrapper { | |||
if (!isset($params['tablePrefix'])) { | |||
throw new \Exception('tablePrefix not set'); | |||
} | |||
/** | |||
* @psalm-suppress InternalMethod | |||
*/ | |||
parent::__construct($params, $driver, $config, $eventManager); | |||
$this->adapter = new $params['adapter']($this); | |||
$this->tablePrefix = $params['tablePrefix']; |
@@ -1,55 +0,0 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl> | |||
* | |||
* @author Christoph Wurst <christoph@winzerhof-wurst.at> | |||
* @author 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 { | |||
public 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(); | |||
} | |||
$this->lastConnectionCheck = $now; | |||
if (!$this->isConnected()) { | |||
$this->close(); | |||
} | |||
return parent::connect(); | |||
} | |||
} |