i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-14 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-app: Code fixes, updated log

Browse Source
This commit is contained in:
gSpot
2021-03-26 23:49:38 +03:00
parent 399ce9fb7f
commit 03eac5f427
16 changed files with 333 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/log.js
+9 -3
View File
@@ -1,9 +1,9 @@
'require fs';
'require ui';
'require view.log.baselog as baselog';
'require view.log.abstract-log as abc';
'require view.ruantiblock.tools as tools';
return baselog.view.extend({
return abc.view.extend({
viewName: 'ruantiblock',
title: _('Ruantiblock') + ' - ' + _('Log'),
@@ -22,6 +22,7 @@ return baselog.view.extend({
return [
lineNum, // # (Number)
strArray.slice(0, 5).join(' '), // Timestamp (String)
null, // Host (String)
logLevel[1], // Level (String)
logLevel[0], // Facility (String)
this.htmlEntities(strArray.slice(6).join(' ')), // Message (String)
@@ -30,9 +31,14 @@ return baselog.view.extend({
// syslog-ng
syslog_ngHandler: function(strArray, lineNum) {
if(!(strArray[3] in this.logHosts)) {
this.logHosts[strArray[3]] = this.makelogHostsDropdownItem(strArray[3]);
};
return [
lineNum, // # (Number)
strArray.slice(0, 3).join(' '), // Timestamp (String)
strArray[3], // Host (String)
null, // Level (String)
null, // Facility (String)
this.htmlEntities(strArray.slice(4).join(' ')), // Message (String)
@@ -48,7 +54,7 @@ return baselog.view.extend({
if(logger) {
return fs.exec_direct(logger, [ '-e', tools.app_name ]).catch(err => {
ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message)));
ui.addNotification(null, E('p', {}, _('Unable to load log data:') + ' ' + err.message));
return '';
});
};