dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added "WAIT_TIMEOUT" and "INTERACTIVE_TIMEOUT" as _MySQL_ required vars to requirements.ini (relevant for persistent DB connections)

Browse Source 
- improved DB requirements shown on `/setup` page
- improved _Redis_ Client connections. Added "client name" (https://redis.io/commands/client-setname)
This commit is contained in:
Mark Friedrich
2019-04-18 18:27:46 +02:00
parent a33615445e
commit 5d17f81bb8
7 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/main/controller/setup.php
View File

@@ -1410,6 +1410,7 @@ class Setup extends Controller {
* @return array
*/
protected function checkDBConfig(\Base $f3, \lib\db\SQL $db) : array {
$checkAll = true;
// some db like "Maria DB" have some strange version strings....
$dbVersionString = $db->version();
$dbVersionParts = explode('-', $dbVersionString);
@@ -1423,11 +1424,13 @@ class Setup extends Controller {
}
$dbConfig = [
'version' => [
'label' => 'DB version',
'required' => $f3->get('REQUIREMENTS.MYSQL.VERSION'),
'version' => $dbVersion,
'check' => version_compare($dbVersion, $f3->get('REQUIREMENTS.MYSQL.VERSION'), '>=' )
'data' => [
'version' => [
'label' => 'DB version',
'required' => $f3->get('REQUIREMENTS.MYSQL.VERSION'),
'version' => $dbVersion,
'check' => version_compare($dbVersion, $f3->get('REQUIREMENTS.MYSQL.VERSION'), '>=' ) ? : $checkAll = false
]
]
];
@@ -1443,16 +1446,32 @@ class Setup extends Controller {
return !empty($match) ? end(reset($match)) : 'unknown';
};
$checkValue = function($requiredValue, $value) : bool {
$check = true;
if(!empty($requiredValue)){
if(is_int($requiredValue)){
$check = $requiredValue <= $value;
}else{
$check = $requiredValue == $value;
}
}
return $check;
};
foreach($mySQLConfig as $param => $requiredValue){
$value = $getValue($param);
$dbConfig[] = [
$dbConfig['data'][] = [
'label' => $param,
'required' => $requiredValue,
'version' => $value,
'check' => !empty($requiredValue) ? ($requiredValue == $value) : true
'check' => $checkValue($requiredValue, $value) ? : $checkAll = false
];
}
$dbConfig['meta'] = [
'check' => $checkAll
];
return $dbConfig;
}