Merge pull request #9425 from nextcloud/db-reconnect-timeout

Check connection status and attempt to reconnect each each minute

2 files changed, 53 insertions, 1 deletions

diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php
index 8a8a2f100ef..8bb959ffbc1 100644
--- a/lib/private/DB/Connection.php
+++ b/lib/private/DB/Connection.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
 	 */
diff --git a/lib/private/DB/ReconnectWrapper.php b/lib/private/DB/ReconnectWrapper.php
new file mode 100644
index 00000000000..27a34c862a7
--- /dev/null
+++ b/lib/private/DB/ReconnectWrapper.php
@@ -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();
+		}
+	}
+}