7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Hide up time of containers that are missing

Browse Source 
[Web] Rename fail2ban logs to netfiter logs
[Web] Adding timeout to curl requests for dockerapi, fixes #981
[Web] Removed cow from favicon
This commit is contained in:
andre.peters
2018-02-01 13:28:17 +01:00
parent c7280e182f
commit b2032c0e8a
12 changed files with 277 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/inc/functions.inc.php
View File

@@ -1134,13 +1134,13 @@ function get_logs($container, $lines = false) {
return $data_array;
}
}
if ($container == "fail2ban-mailcow") {
if ($container == "netfilter-mailcow") {
if (!is_numeric($lines)) {
list ($from, $to) = explode('-', $lines);
$data = $redis->lRange('F2B_LOG', intval($from), intval($to));
$data = $redis->lRange('NETFILTER_LOG', intval($from), intval($to));
}
else {
$data = $redis->lRange('F2B_LOG', 0, intval($lines));
$data = $redis->lRange('NETFILTER_LOG', 0, intval($lines));
}
if ($data) {
foreach ($data as $json_line) {