mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 23:53:13 +09:00
Fix log filtering in Web UI
Remove broken alternative logFilter implementation in web_ui/src/websocket in favour of having one proper function in lib/logging
This commit is contained in:
1 parent
4f6452c90c
commit
27633d51b6
4 files changed
+60
-75
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { libData, libErrors, libLink, libLogging, libPlugin } from "@clusterio/lib";
|
||||
const { logger } = libLogging;
|
||||
const { logFilter, logger } = libLogging;
|
||||
import packageJson from "../../package.json";
|
||||
|
||||
|
||||
@@ -27,22 +27,6 @@ export class ControlConnector extends libLink.WebSocketClientConnector {
|
||||
}
|
||||
}
|
||||
|
||||
function logFilter({ all, master, slave_ids, instance_ids }, info) {
|
||||
if (all) {
|
||||
return true;
|
||||
}
|
||||
if (master && info.slave_id === undefined) {
|
||||
return true;
|
||||
}
|
||||
if (info.slave_id !== undefined && slave_ids.includes(info.slave_id)) {
|
||||
return true;
|
||||
}
|
||||
if (info.instance_id !== undefined && instance_ids.includes(info.instance_id)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles running the control
|
||||
*
|
||||
@@ -504,7 +488,7 @@ export class Control extends libLink.Link {
|
||||
let info = message.data.info;
|
||||
|
||||
for (let [filter, handlers] of this.logHandlers) {
|
||||
if (logFilter(filter, info)) {
|
||||
if (logFilter(filter)(info)) {
|
||||
for (let handler of handlers) {
|
||||
handler(info);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user