From 523a5861763a1d453ae68fa25eb8bafdaa5853b4 Mon Sep 17 00:00:00 2001 From: Robby Date: Fri, 10 May 2019 05:50:18 +0200 Subject: [PATCH] Fix globops logging if there is no predefined sender. --- data/example.conf | 5 +++-- src/logger.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data/example.conf b/data/example.conf index d4ae566f6..6e058b6ff 100644 --- a/data/example.conf +++ b/data/example.conf @@ -677,8 +677,8 @@ log #source = "" /* - * The bot used to log generic messages which have no predefined sender if there - * is a channel in the target directive. + * The bot used to log generic messages which have no predefined sender if the + * target directive is set to a channel or globops. */ bot = "Global" @@ -740,6 +740,7 @@ log */ log { + bot = "Global" target = "globops" admin = "global/* operserv/chankill operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/oline operserv/set operserv/svsnick operserv/svsjoin operserv/svspart nickserv/getpass */drop" servers = "squit" diff --git a/src/logger.cpp b/src/logger.cpp index 011b13e63..f06112eb6 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -376,9 +376,13 @@ void LogInfo::ProcessMessage(const Log *l) } else if (target == "globops") { - if (UplinkSock && l->bi && l->type <= LOG_NORMAL && Me && Me->IsSynced()) + if (UplinkSock && l->type <= LOG_NORMAL && Me && Me->IsSynced()) { - IRCD->SendGlobops(l->bi, "%s", buffer.c_str()); + BotInfo *bi = l->bi; + if (!bi) + bi = this->bot; + if (bi) + IRCD->SendGlobops(bi, "%s", buffer.c_str()); } } }