tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 08:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

DbResourcePage: Validate the version of a PostgreSQL server

Browse Source 
refs #9460
This commit is contained in:
Johannes Meyer 2015-08-18 16:20:25 +02:00
parent e7cfc25b04
commit b7ee867239
1 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
modules/setup/application/forms/DbResourcePage.php
View File

@ -68,11 +68,7 @@ class DbResourcePage extends Form
}
if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
try {
$db = new DbTool($this->getValues());
$db->checkConnectivity();
} catch (PDOException $e) {
$this->error($e->getMessage());
if (! $this->validateConfiguration()) {
$this->addSkipValidationCheckbox();
return false;
}
@ -93,14 +89,7 @@ class DbResourcePage extends Form
public function isValidPartial(array $formData)
{
if (isset($formData['backend_validation']) && parent::isValid($formData)) {
try {
$db = new DbTool($this->getValues());
$db->checkConnectivity();
} catch (PDOException $e) {
$this->warning(sprintf(
$this->translate('Failed to successfully validate the configuration: %s'),
$e->getMessage()
));
if (! $this->validateConfiguration()) {
return false;
}
@ -113,6 +102,54 @@ class DbResourcePage extends Form
return true;
}
/**
* Return whether the configuration is valid
*
* @return bool
*/
protected function validateConfiguration()
{
try {
$db = new DbTool($this->getValues());
$db->checkConnectivity();
} catch (PDOException $e) {
$this->error(sprintf(
$this->translate('Failed to successfully validate the configuration: %s'),
$e->getMessage()
));
return false;
}
if ($this->getValue('db') === 'pgsql') {
if (! $db->isConnected()) {
try {
$db->connectToDb();
} catch (PDOException $e) {
$this->warning($this->translate(sprintf(
'Unable to check the server\'s version. This is usually not a critical error as there is'
. ' probably only access to the database permitted which does not exist yet. If you are'
. ' absolutely sure you are running PostgreSQL in a version equal to or newer than 9.1,'
. ' you can skip the validation and safely proceed to the next step. The error was: %s',
$e->getMessage()
)));
return false;
}
}
$version = $db->getServerVersion();
if (version_compare($version, '9.1', '<')) {
$this->error($this->translate(sprintf(
'The server\'s version %s is too old. The minimum required version is %s.',
$version,
'9.1'
)));
return false;
}
}
return true;
}
/**
* Add a checkbox to the form by which the user can skip the connection validation
*/