ProVM/logview
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup style

Browse Source
This commit is contained in:
Aldarien
2023-02-15 18:01:19 -03:00
parent c29eece81c
commit 894732e806
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/resources/views/logs/show.blade.php
View File

@ -23,7 +23,7 @@
const logs = { const logs = {
id: '', id: '',
start: 0, start: 0,
amount: 10, amount: {{$max_log_amount}},
total: 0, total: 0,
remaining: 0, remaining: 0,
watch_pos: 0, watch_pos: 0,
@ -67,21 +67,23 @@
this.draw().unparsed(parent, log) this.draw().unparsed(parent, log)
}) })
}, },
unparsed: (parent, log) => { title: () => {
const title = $('<div></div>').addClass('title') return $('<div></div>').addClass('title')
.append($('<i></i>').addClass('dropdown icon')) .append($('<i></i>').addClass('dropdown icon'))
},
unparsed: (parent, log) => {
const title = this.draw().title()
const content = $('<div></div>').addClass('content') const content = $('<div></div>').addClass('content')
title.append(log.original) title.append(log.original)
content.html(log.original) content.html(log.original)
parent.append(title).append(content) parent.append(title).append(content)
}, },
parsed: (parent, log) => { parsed: (parent, log) => {
const title = $('<div></div>').addClass('title') const title = this.draw().title()
.append($('<i></i>').addClass('dropdown icon'))
const content = $('<div></div>').addClass('content') const content = $('<div></div>').addClass('content')
title.append( title.append(
$('<span></span>') $('<span></span>')
.addClass(log.severity.toLowerCase()).css('padding-left', '1ex').css('padding-right', '1ex') .addClass(log.severity.toLowerCase()).css('padding', '.5ex 1ex')//.css('padding-left', '1ex').css('padding-right', '1ex')
.html('[' + log.date + '] ' + log.severity) .html('[' + log.date + '] ' + log.severity)
) )
const card = $('<div></div>').addClass('ui fluid basic card').append( const card = $('<div></div>').addClass('ui fluid basic card').append(

4
app/setup/settings/99_general.php Normal file
View File

@ -0,0 +1,4 @@
<?php
return [
'max_log_amount' => $_ENV['MAX_LOG_AMOUNT'] ?? 500
];

3
app/setup/setups/02_view.php
View File

@ -8,7 +8,8 @@ return [
$container->get('folders')->get('cache'), $container->get('folders')->get('cache'),
null, null,
[ [
'urls' => $container->get('urls') 'urls' => $container->get('urls'),
'max_log_amount' => $container->get('max_log_amount')
] ]
); );
} }

9
app/src/Parser/Monolog.php
View File

@ -37,7 +37,6 @@ class Monolog extends Parser
"\s(?:\{|\[)(?<extra>.*)(?:\}|\])" "\s(?:\{|\[)(?<extra>.*)(?:\}|\])"
]; ];
$regex = implode('', $regex); $regex = implode('', $regex);
//$regex = "/\[(?P<date>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}(?:\+|-)\d{2}:\d{2})\]\s(?<channel>\w*)\.(?<severity>\w*):\s(?<message>.*)\s(?:\[|\{)(?<context>.*)(?:\]|\})\s(?:\{|\[)(?<extra>.*)(?:\}|\])/";
try { try {
\Safe\preg_match("/{$regex}/", $content, $matches); \Safe\preg_match("/{$regex}/", $content, $matches);
} catch (\Exception $e) { } catch (\Exception $e) {
@ -66,11 +65,15 @@ class Monolog extends Parser
$log->setStack($lines); $log->setStack($lines);
} }
$log->setMessage($message); $log->setMessage($message);
$log->setContext($matches['context']); if ($matches['context'] !== '') {
if (isset($matches['extra'])) { $log->setContext("{{$matches['context']}}");
}
if (isset($matches['extra']) and $matches['extra'] !== '') {
$extra['extra'] = "{{$matches['extra']}}"; $extra['extra'] = "{{$matches['extra']}}";
} }
if (count($extra) > 0) {
$log->setExtra(\Safe\json_encode($extra, JSON_UNESCAPED_SLASHES)); $log->setExtra(\Safe\json_encode($extra, JSON_UNESCAPED_SLASHES));
}
} catch (\Error $e) { } catch (\Error $e) {
\Safe\error_log($e . PHP_EOL, 3, '/logs/debug.log'); \Safe\error_log($e . PHP_EOL, 3, '/logs/debug.log');
\Safe\error_log(var_export($matches, true) . PHP_EOL, 3, '/logs/debug.log'); \Safe\error_log(var_export($matches, true) . PHP_EOL, 3, '/logs/debug.log');