From c4a4afa905f4062459ecf7a1f2a52947fad12523 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 8 Feb 2022 15:34:45 +0100
Subject: [PATCH] managesieve: Use MASTER_SERVICE_SHUTTING_DOWN_MSG
This also drops the trailing period from the log message, which matches the
changes to core.
---
src/managesieve/main.c | 4 ++--
src/managesieve/managesieve-client.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/managesieve/main.c b/src/managesieve/main.c
index c5fa3e1b7..4dc1c89d2 100644
--- a/src/managesieve/main.c
+++ b/src/managesieve/main.c
@@ -82,8 +82,8 @@ void managesieve_refresh_proctitle(void)
static void client_kill_idle(struct client *client)
{
mail_storage_service_io_activate_user(client->service_user);
- client_send_bye(client, "Server shutting down.");
- client_destroy(client, "Server shutting down.");
+ client_send_bye(client, MASTER_SERVICE_SHUTTING_DOWN_MSG".");
+ client_destroy(client, MASTER_SERVICE_SHUTTING_DOWN_MSG);
}
static void managesieve_die(void)
diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index f7fb0ccf4..89e29d2dc 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -781,8 +781,8 @@ void client_kick(struct client *client)
{
mail_storage_service_io_activate_user(client->service_user);
if (!client->command_pending)
- client_send_bye(client, "Server shutting down.");
- client_destroy(client, "Server shutting down.");
+ client_send_bye(client, MASTER_SERVICE_SHUTTING_DOWN_MSG".");
+ client_destroy(client, MASTER_SERVICE_SHUTTING_DOWN_MSG);
}
void clients_destroy_all(void)
--
GitLab