imap: Don't update proctitle to [unhibernating] if verbose_proctitle=no

diff --git a/src/imap/imap-common.h b/src/imap/imap-common.h
index 4cb236799b6fa3c53324974d002fc32e98e02350..42c3f6fc844b6c0b36d4900dbdf3a7febfe21cff 100644 (file)
--- a/src/imap/imap-common.h
+++ b/src/imap/imap-common.h
@@ -23,6 +23,7 @@ typedef void imap_client_created_func_t(struct client **client);
 
 extern imap_client_created_func_t *hook_client_created;
 extern bool imap_debug;
+extern bool verbose_proctitle;
 extern struct event_category event_category_imap;
 
 /* Sets the hook_client_created and returns the previous hook,

diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c
index 952c085f92981bf8a9b5b76ef10e48288ec82173..9ae429e5cd5f0a8465e410e1bcaa0146805288df 100644 (file)
--- a/src/imap/imap-master-client.c
+++ b/src/imap/imap-master-client.c
@@ -311,7 +311,8 @@ imap_master_client_input_args(struct connection *conn, const char *const *args,
                i_close_fd(&fd_client);
                return -1;
        }
-       process_title_set("[unhibernating]");
+       if (verbose_proctitle)
+               process_title_set("[unhibernating]");
 
        /* NOTE: before client_create_from_input() on failures we need to close
           fd_client, but afterward it gets closed by client_destroy() */

diff --git a/src/imap/main.c b/src/imap/main.c
index b4c9fc546ea4001e6a1a77bbbb84e11710827981..c0771fc8f16602a1c63356c6fa05ca8f148716d4 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -34,13 +34,13 @@
 
 #define IMAP_DIE_IDLE_SECS 10
 
-static bool verbose_proctitle = FALSE;
 static struct mail_storage_service_ctx *storage_service;
 static struct login_server *login_server = NULL;
 static struct timeout *to_proctitle;
 
 imap_client_created_func_t *hook_client_created = NULL;
 bool imap_debug = FALSE;
+bool verbose_proctitle = FALSE;
 
 struct event_category event_category_imap = {
        .name = "imap",

diff --git a/src/imap/test-imap-client-hibernate.c b/src/imap/test-imap-client-hibernate.c
index 1c04d26aef078ceb9497b74fd212bec04d38d63d..6ba3ad02487647c1c35f415a6fc1d21a5e46f04a 100644 (file)
--- a/src/imap/test-imap-client-hibernate.c
+++ b/src/imap/test-imap-client-hibernate.c
@@ -34,6 +34,7 @@ struct test_imap_client_hibernate {
 
 imap_client_created_func_t *hook_client_created = NULL;
 bool imap_debug = FALSE;
+bool verbose_proctitle = FALSE;
 
 static const char *tmpdir;
 static struct mail_storage_service_ctx *storage_service;