From 0585137946bb302982364d681bf1c398834585e4 Mon Sep 17 00:00:00 2001 From: Martin Johansson Date: Sat, 25 Feb 2012 22:01:02 +0100 Subject: [PATCH] Improve logging for kick/ban --- src/ban.c | 6 +++--- src/messagehandler.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ban.c b/src/ban.c index d91fb5a..fbf711a 100644 --- a/src/ban.c +++ b/src/ban.c @@ -53,9 +53,9 @@ void Ban_UserBan(client_t *client, char *reason) list_add_tail(&ban->node, &banlist); SSLi_hash2hex(ban->hash, hexhash); - Log_info("User %s kickbanned. Reason: '%s' Hash: %s IP: %s Banned for: %d seconds", - ban->name, ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)), - getIntConf(BAN_LENGTH)); + Log_info_client(client, "User kickbanned. Reason: '%s' Hash: %s IP: %s Banned for: %d seconds", + ban->name, ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)), + getIntConf(BAN_LENGTH)); } diff --git a/src/messagehandler.c b/src/messagehandler.c index 1e7a556..50b648a 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -187,7 +187,7 @@ void Mh_handle_message(client_t *client, message_t *msg) if (strlen(getStrConf(ADMIN_PASSPHRASE)) > 0 && Client_token_match(client, getStrConf(ADMIN_PASSPHRASE))) { client->isAdmin = true; - Log_info("User is admin"); + Log_info_client(client, "User provided admin password"); } /* Setup UDP encryption */ @@ -837,7 +837,8 @@ void Mh_handle_message(client_t *client, message_t *msg) if (msg->payload.userRemove->has_ban && msg->payload.userRemove->ban) { Ban_UserBan(target, msg->payload.userRemove->reason); } else { - Log_info("User kicked"); + Log_info_client(target, "User kicked. Reason: '%s'", + strlen(msg->payload.userRemove->reason) == 0 ? "N/A" : msg->payload.userRemove->reason); } /* Re-use message */ Msg_inc_ref(msg); -- 2.30.2