From bdd83de7a9d4cb9a9337e7c156893517b82e2ad9 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Mon, 27 Apr 2020 00:50:28 +0200 Subject: [PATCH] Strip the 'yabridge-' prefix from log messages --- src/plugin/host-bridge.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plugin/host-bridge.cpp b/src/plugin/host-bridge.cpp index c0b1caee..f0239ef1 100644 --- a/src/plugin/host-bridge.cpp +++ b/src/plugin/host-bridge.cpp @@ -450,9 +450,16 @@ void HostBridge::async_log_pipe_lines(patched_async_pipe& pipe, * @return A prefix string for log messages. */ std::string create_logger_prefix(const fs::path& socket_path) { + // Use the socket filename as the logger prefix, but strip the `yabridge-` + // part since that's redundant + std::string socket_name = + socket_path.filename().replace_extension().string(); + const std::string socket_prefix("yabridge-"); + assert(socket_name.find(socket_prefix) == 0); + socket_name = socket_name.substr(socket_prefix.size()); + std::ostringstream prefix; - prefix << "[" << socket_path.filename().replace_extension().string() - << "] "; + prefix << "[" << socket_name << "] "; return prefix.str(); }