Improve the log level display

diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index 1839986c551d553e5060a8902ed66938d285c31f..2b0a561afe3c215c7fc99104e6b3897d24980dd4 100644 (file)
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -66,11 +66,14 @@ class Settings extends BaseAdmin
                parent::content();
 
                $log_choices = [
-                       LogLevel::ERROR   => 'Error',
-                       LogLevel::WARNING => 'Warning',
-                       LogLevel::NOTICE  => 'Notice',
-                       LogLevel::INFO    => 'Info',
-                       LogLevel::DEBUG   => 'Debug',
+                       LogLevel::EMERGENCY => 'Emergency',
+                       LogLevel::ALERT     => 'Alert',
+                       LogLevel::CRITICAL  => 'Critical',
+                       LogLevel::ERROR     => 'Error',
+                       LogLevel::WARNING   => 'Warning',
+                       LogLevel::NOTICE    => 'Notice',
+                       LogLevel::INFO      => 'Info',
+                       LogLevel::DEBUG     => 'Debug',
                ];
 
                if (ini_get('log_errors')) {

diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php
index 378e2d41b73a9852970febbe5104fb34122d9218..b03e9649f040c1a50e078ede950ce065c982c459 100644 (file)
--- a/src/Module/Admin/Logs/View.php
+++ b/src/Module/Admin/Logs/View.php
@@ -47,6 +47,8 @@ class View extends BaseAdmin
                $filters_valid_values = [
                        'level' => [
                                '',
+                               LogLevel::EMERGENCY,
+                               LogLevel::ALERT,
                                LogLevel::CRITICAL,
                                LogLevel::ERROR,
                                LogLevel::WARNING,
@@ -54,7 +56,7 @@ class View extends BaseAdmin
                                LogLevel::INFO,
                                LogLevel::DEBUG,
                        ],
-                       'context' => ['', 'index', 'worker'],
+                       'context' => ['', 'index', 'worker', 'daemon'],
                ];
                $filters = [
                        'level'   => $_GET['level'] ?? '',
@@ -71,10 +73,10 @@ class View extends BaseAdmin
                } else {
                        try {
                                $data = DI::parsedLogIterator()
-                                               ->open($f)
-                                               ->withLimit(self::LIMIT)
-                                               ->withFilters($filters)
-                                               ->withSearch($search);
+                                       ->open($f)
+                                       ->withLimit(self::LIMIT)
+                                       ->withFilters($filters)
+                                       ->withSearch($search);
                        } catch (\Exception $e) {
                                $error = DI::l10n()->t('Couldn\'t open <strong>%1$s</strong> log file.<br/>Check to see if file %1$s is readable.', $f);
                        }

diff --git a/view/global.css b/view/global.css
index 74ef4631de688cd20d5ead51553d824817a289ee..41a287a1c3d804e9de4cacddd08d2f438441c74c 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -773,3 +773,13 @@ figure.img-allocated-height img{
        color: #731289; /* purple */
        font-weight: bold;
 }
+.loglevel-alert {
+       color: #ff0000; /* red */
+       font-weight: bold;
+       font-style: italic;
+}
+.loglevel-emergency {
+       color: #731289; /* purple */
+       font-weight: bold;
+       font-style: italic;
+}

diff --git a/view/theme/frio/templates/admin/logs/view.tpl b/view/theme/frio/templates/admin/logs/view.tpl
index cac7b7d45830bfd43582c0b36bb697bd0ec70415..4a5c77f53d085eca68d65cd79b8eb52000037abb 100644 (file)
--- a/view/theme/frio/templates/admin/logs/view.tpl
+++ b/view/theme/frio/templates/admin/logs/view.tpl
@@ -65,11 +65,14 @@
                                        data-data="{{$row->data}}" data-source="{{$row->source}}">
                                        <td>{{$row->date}}</td>
                                        <td class="
-                                               {{if $row->level == "CRITICAL"}}bg-danger
+                                               {{if $row->level == "EMERGENCY"}}bg-danger
+                                               {{elseif $row->level == "ALERT"}}bg-danger
+                                               {{elseif $row->level == "CRITICAL"}}bg-danger
                                                {{elseif $row->level == "ERROR"}}bg-danger
                                                {{elseif $row->level == "WARNING"}}bg-warning
                                                {{elseif $row->level == "NOTICE"}}bg-info
-                                               {{elseif $row->level == "DEBUG"}}text-muted
+                                               {{elseif $row->level == "INFO"}}bg-info
+                                               {{else}}text-muted
                                                {{/if}}
                                        ">{{$row->level}}</td>
                                        <td>{{$row->context}}</td>