cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [brood:connectionTest] Correctly handles network exceptions

cli-modification-summary
Sami Mokaddem 2022-01-24 16:35:42 +01:00 committed by Sami Mokaddem
parent 4f8b663b87
commit eef09f44c4
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Model/Table/BroodsTable.php
View File

@ -9,6 +9,7 @@ use Cake\Core\Configure;
use Cake\Http\Client; use Cake\Http\Client;
use Cake\Http\Client\Response; use Cake\Http\Client\Response;
use Cake\Http\Exception\NotFoundException; use Cake\Http\Exception\NotFoundException;
use Cake\Http\Client\Exception\NetworkException;
use Cake\ORM\TableRegistry; use Cake\ORM\TableRegistry;
use Cake\Error\Debugger; use Cake\Error\Debugger;
@ -69,7 +70,14 @@ class BroodsTable extends AppTable
{ {
$brood = $this->find()->where(['id' => $id])->first(); $brood = $this->find()->where(['id' => $id])->first();
$start = microtime(true); $start = microtime(true);
$response = $this->HTTPClientGET('/instance/status.json', $brood); try {
$response = $this->HTTPClientGET('/instance/status.json', $brood);
} catch (NetworkException $e) {
return [
'error' => __('Could not query status'),
'reason' => $e->getMessage(),
];
}
$ping = ((int)(100 * (microtime(true) - $start))); $ping = ((int)(100 * (microtime(true) - $start)));
$errors = [ $errors = [
403 => [ 403 => [

4
webroot/js/main.js
View File

@ -55,8 +55,10 @@ function attachTestConnectionResultHtml(result, $container) {
$testResultDiv.append(getKVHtml('Internal error', result, ['text-danger fw-bold'])) $testResultDiv.append(getKVHtml('Internal error', result, ['text-danger fw-bold']))
} else { } else {
if (result['error']) { if (result['error']) {
if (result['ping']) {
$testResultDiv.append('Status', 'OK', ['text-danger'], `${result['ping']} ms`);
}
$testResultDiv.append( $testResultDiv.append(
getKVHtml('Status', 'OK', ['text-danger'], `${result['ping']} ms`),
getKVHtml('Status', `Error: ${result['error']}`, ['text-danger']), getKVHtml('Status', `Error: ${result['error']}`, ['text-danger']),
getKVHtml('Reason', result['reason'], ['text-danger']) getKVHtml('Reason', result['reason'], ['text-danger'])
) )