From af35794006eb89ffca739ca693c2a29731547ca9 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 22 Jun 2018 14:43:32 +0200 Subject: [PATCH] Revert "lib/db: Allow to configure persistent connections" This reverts commit 4763b6b20a41b674f9ca416421437a1afaca0d03. --- library/Icinga/Data/Db/DbConnection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php index f38f6eb75..faac4b95b 100644 --- a/library/Icinga/Data/Db/DbConnection.php +++ b/library/Icinga/Data/Db/DbConnection.php @@ -62,7 +62,8 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp private static $driverOptions = array( PDO::ATTR_TIMEOUT => 10, PDO::ATTR_CASE => PDO::CASE_LOWER, - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + // TODO: allow configurable PDO::ATTR_PERSISTENT => true ); /** @@ -141,7 +142,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp 'password' => $this->config->password, 'dbname' => $this->config->dbname, 'charset' => $this->config->charset ?: null, - 'persistent' => (bool) $this->config->get('persistent', false), 'options' => & $genericAdapterOptions, 'driver_options' => & $driverOptions );