Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-31 06:40:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: tools: Fix function execAndRead

Browse Source
This commit is contained in:
remittor
2026-01-27 19:27:40 +03:00
parent 3ab854aedf
commit 5297980d79
3 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js
View File

@@ -49,7 +49,7 @@ return baseclass.extend({
log: '/tmp/'+tools.appName+'_dwc.log',
logArea: this.logArea,
callback: this.execAndReadCallback,
cbarg: this, // wnd
ctx: this,
});
},
@@ -70,27 +70,27 @@ return baseclass.extend({
log: '/tmp/'+tools.appName+'_dwc.log',
logArea: this.logArea,
callback: this.execAndReadCallback,
cbarg: this, // wnd
ctx: this,
});
},
execAndReadCallback: function(wnd, rc, txt = '')
execAndReadCallback: function(rc, txt = '')
{
wnd.setBtnMode(1, 1, 1);
this.setBtnMode(1, 1, 1);
if (rc == 0 && txt) {
wnd.appendLog('=========================================================');
this.appendLog('=========================================================');
return;
}
if (rc >= 500) {
if (txt) {
wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
} else {
wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
}
} else {
wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
this.appendLog('ERROR: Process finished with retcode = ' + rc);
}
wnd.appendLog('=========================================================');
this.appendLog('=========================================================');
},
openDiagnostDialog: function(pkg_arch)