tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3480 from Icinga/fix/revert-persistent-db-connections 

No longer support persistent database connections
This commit is contained in:
Eric Lippmann 2018-06-27 09:36:37 +02:00 committed by GitHub
parent 184d4afdbd 4d42c043e4
commit c633c86db7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/forms/Config/Resource/DbResourceForm.php
View File

@ -146,17 +146,6 @@ class DbResourceForm extends Form
'label' => $this->translate('Character Set') 'label' => $this->translate('Character Set')
) )
); );
$this->addElement(
'checkbox',
'persistent',
array(
'description' => $this->translate(
'Check this box for persistent database connections. Persistent connections are not closed at the'
. ' end of a request, but are cached and re-used. This is experimental'
),
'label' => $this->translate('Persistent')
)
);
$this->addElement( $this->addElement(
'checkbox', 'checkbox',
'use_ssl', 'use_ssl',

2
library/Icinga/Data/Db/DbConnection.php
View File

@ -141,7 +141,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
'password' => $this->config->password, 'password' => $this->config->password,
'dbname' => $this->config->dbname, 'dbname' => $this->config->dbname,
'charset' => $this->config->charset ?: null, 'charset' => $this->config->charset ?: null,
'persistent' => (bool) $this->config->get('persistent', false),
'options' => & $genericAdapterOptions, 'options' => & $genericAdapterOptions,
'driver_options' => & $driverOptions 'driver_options' => & $driverOptions
); );
@ -159,7 +158,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
} }
if ($pdoType === 'dblib') { if ($pdoType === 'dblib') {
// Driver does not support setting attributes // Driver does not support setting attributes
unset($adapterParamaters['persistent']);
unset($adapterParamaters['options']); unset($adapterParamaters['options']);
unset($adapterParamaters['driver_options']); unset($adapterParamaters['driver_options']);
} }