MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7160 from JakubOnderka/fix-diagnotics 

fix: [UI] Module diagnostics view
pull/7167/head
Jakub Onderka 2021-03-05 08:16:46 +01:00 committed by GitHub
parent 6c89e0219c 5d2ae28a58
commit 941981813a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/View/Elements/healthElements/diagnostics.ctp
View File

@ -293,7 +293,7 @@
<b><?= __('Memory allocator') ?>:</b> <?= $redisInfo['mem_allocator'] ?><br>
<b><?= __('Memory usage') ?>:</b> <?= $redisInfo['used_memory_human'] ?>B<br>
<b><?= __('Peak memory usage') ?>:</b> <?= $redisInfo['used_memory_peak_human'] ?>B<br>
<b><?= __('Fragmentation ratio') ?>:</b> <?= $redisInfo['mem_fragmentation_ratio'] ?>B<br>
<b><?= __('Fragmentation ratio') ?>:</b> <?= $redisInfo['mem_fragmentation_ratio'] ?><br>
<b><?= __('Total system memory') ?>:</b> <?= $redisInfo['total_system_memory_human'] ?>B
<?php elseif ($redisInfo['extensionVersion']): ?>
<span class="red bold">Redis is not available. <?= $redisInfo['connection_error'] ?></span>
@ -435,23 +435,18 @@
<p><?php echo __('This tool tests the various module systems and whether they are reachable based on the module settings.');?></p>
<div class="diagnostics-box">
<?php
foreach ($moduleTypes as $type):
?>
<?php
$colour = 'red';
if (isset($moduleErrors[$moduleStatus[$type]])) {
$message = $moduleErrors[$moduleStatus[$type]];
} else {
$message = h($moduleStatus[$type]);
}
if ($moduleStatus[$type] === 0) {
$colour = 'green';
}
echo $type . __(' module system') . '…<span style="color:' . $colour . ';">' . $message . '</span>';
?>
<?php
endforeach;
foreach ($moduleTypes as $type) {
$colour = 'red';
if (isset($moduleErrors[$moduleStatus[$type]])) {
$message = $moduleErrors[$moduleStatus[$type]];
} else {
$message = h($moduleStatus[$type]);
}
if ($moduleStatus[$type] === 0) {
$colour = 'green';
}
echo $type . __(' module system') . '…<span style="color:' . $colour . ';">' . $message . '</span><br>';
}
?>
</div>