lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2960: Limit line length in log widget

Browse Source
This commit is contained in:
Michael Steenbeek 2018-12-06 11:50:59 +01:00
parent f7b0aa6bb0
commit 010aa33de0
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/www/diag_logs_common.inc
View File

@ -63,7 +63,16 @@ function print_dump($logarr)
}
}
function dump_clog($logfile, $tail, $grepfor = '')
function limit_log_line_length(string $line, int $lineCharLimit): string
{
if (strlen($line) <= $lineCharLimit) {
return $line;
} else {
return substr($line, 0, $lineCharLimit - 1) . '…';
}
}
function dump_clog($logfile, $tail, $grepfor = '', int $lineCharLimit = 0)
{
global $config;
@ -89,10 +98,16 @@ function dump_clog($logfile, $tail, $grepfor = '')
$logarr = sprintf(gettext('File %s yielded no results.'), $logfile);
}
if ($lineCharLimit != 0) {
$logarr = array_map(function($value) use ($lineCharLimit) {
return limit_log_line_length($value, $lineCharLimit);
}, $logarr);
}
print_dump($logarr);
}
function dump_log($logfile, $tail, $grepfor = '')
function dump_log($logfile, $tail, $grepfor = '', int $lineCharLimit = 0)
{
global $config;
@ -118,5 +133,11 @@ function dump_log($logfile, $tail, $grepfor = '')
$logarr = sprintf(gettext('File %s yielded no results.'), $logfile);
}
if ($lineCharLimit != 0) {
$logarr = array_map(function($value) use ($lineCharLimit) {
return limit_log_line_length($value, $lineCharLimit);
}, $logarr);
}
print_dump($logarr);
}

2
src/www/widgets/widgets/system_log.widget.php
View File

@ -70,7 +70,7 @@ require_once('diag_logs_common.inc');
<div id="system_log-widgets" class="content-box" style="overflow:scroll;">
<table class="table table-striped">
<?php dump_clog($system_logfile, $syslogEntriesToFetch); ?>
<?php dump_clog($system_logfile, $syslogEntriesToFetch, '', 250); ?>
</table>
</div>