Browse Source

Merge pull request #12931 from miguelvazq/HPCC-22495

HPCC-22495 Add support for Audience log column

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 năm trước cách đây
mục cha
commit
d24890fdaf

+ 3 - 2
esp/src/eclwatch/LogWidget.js

@@ -197,12 +197,13 @@ define([
                     store: store,
                     query: this.getFilter(),
                     columns: {
-                        lineNo: { label: this.i18n.Line, width: 80 },
-                        details: { label: this.i18n.Details, width: 1024 },
+                        lineNo: {width: 80 },
+                        audience: { label: this.i18n.Audience, width: 60},
                         date: { label: this.i18n.Date, width: 100 },
                         time: { label: this.i18n.Time, width: 100 },
                         pid: { label: "PID", width: 60 },
                         tid: { label: "TID", width: 60 },
+                        details: { label: this.i18n.Details, width: 1024 },
                         dummy: { label: "", width: 0 }
                     }
                 }, this.id + "LogGrid");

+ 1 - 0
esp/src/eclwatch/nls/hpcc.js

@@ -53,6 +53,7 @@ define({root:
     ArchivedOnly: "Archived Only",
     ArchivedWarning: "Warning: please specify a small date range. If not, it may take some time to retrieve the workunits and the browser may be timed out.",
     Attach: "Attach",
+    Audience: "Audience",
     AuditLogs: "Audit Log",
     BinaryInstalls: "Binary Installs",
     Attribute: "Attribute",

+ 4 - 1
esp/src/src/WsTopology.ts

@@ -45,16 +45,19 @@ var TpLogFileStore = declare([Memory, Evented], {
                         if (options.start === 0 || idx > 0) {
                             //  Throw away first line as it will probably only be a partial line  ---
                             var itemParts = item.split(" ");
-                            var lineNo, date, time, pid, tid, details;
+                            var lineNo, audience, time, pid, tid, date, details;
                             if (itemParts.length) lineNo = nextItem(itemParts);
+                            if (itemParts.length) audience = nextItem(itemParts);
                             if (itemParts.length) date = nextItem(itemParts);
                             if (itemParts.length) time = nextItem(itemParts);
                             if (itemParts.length) pid = nextItem(itemParts);
                             if (itemParts.length) tid = nextItem(itemParts);
                             if (itemParts.length) details = itemParts.join(" ");
+
                             data.push({
                                 __hpcc_id: response.TpLogFileResponse.PageNumber + "_" + idx,
                                 lineNo: lineNo,
+                                audience: audience,
                                 date: date,
                                 time: time,
                                 pid: pid,