From 32688372fe83f8bdac669d88c38fa36f16dd1a53 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 26 Mar 2022 15:48:46 +0200 Subject: [PATCH] Improve log coloring --- maubot/lib/color_log.py | 3 +++ .../frontend/src/pages/dashboard/index.js | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/maubot/lib/color_log.py b/maubot/lib/color_log.py index 4fb94e0..8c36ed5 100644 --- a/maubot/lib/color_log.py +++ b/maubot/lib/color_log.py @@ -38,6 +38,9 @@ class ColorFormatter(BaseColorFormatter): instance = "maubot.instance" if module.startswith(instance + "."): return f"{MAU_COLOR}{instance}{RESET}.{INST_COLOR}{module[len(instance) + 1:]}{RESET}" + instance_db = "maubot.instance_db" + if module.startswith(instance_db + "."): + return f"{MAU_COLOR}{instance_db}{RESET}.{INST_COLOR}{module[len(instance_db) + 1:]}{RESET}" loader = "maubot.loader" if module.startswith(loader + "."): return f"{MAU_COLOR}{instance}{RESET}.{LOADER_COLOR}{module[len(loader) + 1:]}{RESET}" diff --git a/maubot/management/frontend/src/pages/dashboard/index.js b/maubot/management/frontend/src/pages/dashboard/index.js index bbf6c58..9655a00 100644 --- a/maubot/management/frontend/src/pages/dashboard/index.js +++ b/maubot/management/frontend/src/pages/dashboard/index.js @@ -95,18 +95,20 @@ class Dashboard extends Component { const processEntry = (entry) => { entry.time = new Date(entry.time) entry.nameSuffix = "" - if (entry.name.startsWith("maubot.")) { - entry.name = entry.name.substr("maubot.".length) - } - if (entry.name.startsWith("client.")) { + if (entry.name.startsWith("maubot.client.")) { if (entry.name.endsWith(".crypto")) { entry.name = entry.name.slice(0, -".crypto".length) entry.nameSuffix = "/crypto" } - entry.name = entry.name.substr("client.".length) - entry.nameLink = `/client/${entry.name}` - } else if (entry.name.startsWith("instance.")) { - entry.nameLink = `/instance/${entry.name.substr("instance.".length)}` + entry.name = `client/${entry.name.slice("maubot.client.".length)}` + entry.nameLink = `/${entry.name}` + } else if (entry.name.startsWith("maubot.instance.")) { + entry.name = `instance/${entry.name.slice("maubot.instance.".length)}` + entry.nameLink = `/${entry.name}` + } else if (entry.name.startsWith("maubot.instance_db.")) { + entry.nameSuffix = "/db" + entry.name = `instance/${entry.name.slice("maubot.instance_db.".length)}` + entry.nameLink = `/${entry.name}` } }