whistle 2.9.46 → 2.9.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/menu.html +1 -0
- package/assets/tab.html +1 -0
- package/biz/webui/cgi-bin/get-data.js +6 -2
- package/biz/webui/htdocs/index.html +1 -1
- package/biz/webui/htdocs/js/index.js +16 -16
- package/lib/service/extract-saz.js +3 -0
- package/lib/service/generate-saz.js +1 -0
- package/lib/util/index.js +2 -1
- package/package.json +3 -3
package/assets/menu.html
CHANGED
|
@@ -157,6 +157,7 @@
|
|
|
157
157
|
Object.keys(options.msgBox).forEach(function(name) {
|
|
158
158
|
toast[name] = options.msgBox[name];
|
|
159
159
|
});
|
|
160
|
+
whistleBridge.updateUI = options.updateUI;
|
|
160
161
|
whistleBridge.copyText = options.copyText;
|
|
161
162
|
whistleBridge.pageId = options.pageId;
|
|
162
163
|
whistleBridge.compose = options.compose;
|
package/assets/tab.html
CHANGED
|
@@ -282,6 +282,7 @@
|
|
|
282
282
|
});
|
|
283
283
|
getActiveSession = options.getActiveSession;
|
|
284
284
|
getSelectedSessionList = options.getSelectedSessionList;
|
|
285
|
+
whistleBridge.updateUI = options.updateUI;
|
|
285
286
|
whistleBridge.copyText = options.copyText;
|
|
286
287
|
whistleBridge.pageId = options.pageId;
|
|
287
288
|
whistleBridge.compose = options.compose;
|
|
@@ -20,6 +20,8 @@ module.exports = function(req, res) {
|
|
|
20
20
|
var stopRecordConsole = data.startLogTime == -3;
|
|
21
21
|
var stopRecordSvrLog = data.startSvrLogTime == -3;
|
|
22
22
|
var h = req.headers;
|
|
23
|
+
var curLogId = proxy.getLatestId();
|
|
24
|
+
var curSvrLogId = logger.getLatestId();
|
|
23
25
|
util.sendGzip(req, res, {
|
|
24
26
|
ec: 0,
|
|
25
27
|
version: config.version,
|
|
@@ -36,8 +38,10 @@ module.exports = function(req, res) {
|
|
|
36
38
|
mvaluesTime: config.mvaluesTime,
|
|
37
39
|
server: util.getServerInfo(req),
|
|
38
40
|
hasARules: rulesUtil.hasAccountRules ? 1 : undefined,
|
|
39
|
-
|
|
40
|
-
|
|
41
|
+
curLogId: stopRecordConsole ? undefined : curLogId,
|
|
42
|
+
curSvrLogId: stopRecordSvrLog ? undefined : curSvrLogId,
|
|
43
|
+
lastLogId: stopRecordConsole ? curLogId : undefined,
|
|
44
|
+
lastSvrLogId: stopRecordSvrLog ? curSvrLogId : undefined,
|
|
41
45
|
log: stopRecordConsole ? [] : proxy.getLogs(data.startLogTime, data.count, data.logId),
|
|
42
46
|
svrLog: stopRecordSvrLog ? [] : logger.getLogs(data.startSvrLogTime, data.count),
|
|
43
47
|
plugins: pluginMgr.getPlugins(),
|