www/nginx: style sweep

This commit is contained in:
Franco Fichtner
2021-12-10 10:51:38 +01:00
parent be4c373145
commit 8f9bada228
5 changed files with 17 additions and 30 deletions
@@ -54,11 +54,9 @@ class LogsController extends ApiControllerBase
if (!isset($uuid)) {
// emulate REST API -> /accesses delivers a list of servers with access logs
return $this->list_vhosts();
}
elseif (!isset($fileno)) {
} elseif (!isset($fileno)) {
return $this->list_logfiles('access', $uuid);
}
else {
} else {
// emulate REST call for a specific log /accesses/uuid
$this->get_logs('access', $uuid, $fileno, $page, $perPage, $query);
}
@@ -90,11 +88,9 @@ class LogsController extends ApiControllerBase
if (!isset($uuid)) {
// emulate REST API -> /errors delivers a list of servers with error logs
return $this->list_vhosts();
}
elseif (!isset($fileno)) {
} elseif (!isset($fileno)) {
return $this->list_logfiles('error', $uuid);
}
else {
} else {
// emulate REST call for a specific log /errors/uuid
$this->get_logs('error', $uuid, $fileno, $page, $perPage, $query);
}
@@ -117,11 +113,9 @@ class LogsController extends ApiControllerBase
if (!isset($uuid)) {
// emulate REST API -> /stream_accesses delivers a list of servers with access logs
return $this->list_streams();
}
elseif (!isset($fileno)) {
} elseif (!isset($fileno)) {
return $this->list_stream_logfiles('streamaccess', $uuid);
}
else {
} else {
// emulate REST call for a specific log /stream_accesses/uuid
$this->get_stream_logs('streamaccess', $uuid, $fileno, $page, $perPage, $query);
}
@@ -144,11 +138,9 @@ class LogsController extends ApiControllerBase
if (!isset($uuid)) {
// emulate REST API -> /stream_errors delivers a list of servers with error logs
return $this->list_streams();
}
elseif (!isset($fileno)) {
} elseif (!isset($fileno)) {
return $this->list_stream_logfiles('streamerror', $uuid);
}
else {
} else {
// emulate REST call for a specific log /stream_errors/uuid
$this->get_stream_logs('streamerror', $uuid, $fileno, $page, $perPage, $query);
}
@@ -74,7 +74,7 @@ abstract class LogParserBase
$filtering = true;
}
}
$cnt = 0;
foreach ($lines as $line) {
$pass = true;
@@ -120,4 +120,3 @@ abstract class LogParserBase
return $this->result;
}
}
@@ -34,7 +34,8 @@ use OPNsense\Nginx\Nginx;
$log_prefix = '/var/log/nginx/';
$log_suffix = '.log';
function list_logfiles($prefix) {
function list_logfiles($prefix)
{
global $log_prefix;
$filename = $log_prefix . $prefix;
@@ -70,8 +71,7 @@ $result = [];
// special case: the global error log
if ($server == 'global') {
$result = list_logfiles('error.log');
}
else {
} else {
switch ($mode) {
case 'error':
case 'access':
@@ -83,8 +83,7 @@ else {
$log_file_name = basename($server_names) . '.' . $mode . $log_suffix;
$result = list_logfiles($log_file_name);
}
else {
} else {
die('{"error": "UUID not found"}');
}
break;
@@ -68,8 +68,7 @@ $result = [];
// special case: the global error log
if ($server == 'global') {
$logparser = new ErrorLogParser($log_prefix . 'error' . $log_suffix, $page, $per_page, $query);
}
else {
} else {
switch ($mode) {
case 'error':
case 'access':
@@ -90,8 +89,7 @@ else {
} elseif ($mode == 'access') {
$logparser = new AccessLogParser($log_file_name, $page, $per_page, $query);
}
}
else {
} else {
die('{"error": "UUID not found"}');
}
break;
@@ -124,8 +122,7 @@ else {
// we cannot parse the file - something went wrong
if ($logparser === null) {
$result['error'] = 'cannot retrieve requested logs';
}
else {
} else {
$result['lines'] = $logparser->get_result();
$result['pages'] = $logparser->page_count;
$result['total'] = $logparser->total_lines;
@@ -64,7 +64,7 @@ const LogView = Backbone.View.extend({
else {
tbody.html('');
}
if (this.collection.length !== 0) {
if (this.current_filtered_collection == null) {
this.collection.forEach(