From 08c3b99dfb17d6f7b284664366291010eed9e455 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sat, 26 Mar 2016 17:56:11 -0700 Subject: [PATCH] relay: fix ambiguous logging in KICK blocking --- plugins/relay.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/relay.py b/plugins/relay.py index a18faa1..6e89377 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -934,14 +934,14 @@ def handle_kick(irc, source, command, args): # Join the kicked client back with its respective modes. irc.proto.sjoin(irc.sid, channel, [(modes, target)]) if kicker in irc.users: - log.info('(%s) relay.handle_kick: Blocked KICK (reason %r) from %s to relay client %s on %s.', - irc.name, args['text'], irc.users[source].nick, - remoteirc.users[real_target].nick, channel) + log.info('(%s) relay: Blocked KICK (reason %r) from %s/%s to relay client %s/%s on %s.', + irc.name, args['text'], irc.users[source].nick, irc.name, + remoteirc.users[real_target].nick, remoteirc.name, channel) irc.msg(kicker, "This channel is claimed; your kick to " "%s has been blocked because you are not " "(half)opped." % channel, notice=True) else: - log.info('(%s) relay.handle_kick: Blocked KICK (reason %r) from server %s to relay client %s/%s on %s.', + log.info('(%s) relay: Blocked KICK (reason %r) from server %s to relay client %s/%s on %s.', irc.name, args['text'], irc.servers[source].name, remoteirc.users[real_target].nick, remoteirc.name, channel) return