From: Timo Sirainen Date: Fri, 3 Dec 2010 06:57:58 +0000 (+0000) Subject: imap, pop3: Removed previous log prefix hack. X-Git-Tag: 2.0.8~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5be786ac7cafd3dcd8574edaec31eb414ae92b03;p=thirdparty%2Fdovecot%2Fcore.git imap, pop3: Removed previous log prefix hack. --- diff --git a/src/imap/cmd-append.c b/src/imap/cmd-append.c index 13117bd374..7e6b9a1ba8 100644 --- a/src/imap/cmd-append.c +++ b/src/imap/cmd-append.c @@ -51,7 +51,6 @@ static void client_input_append(struct client_command_context *cmd) client->last_input = ioloop_time; timeout_reset(client->to_idle); - client_log_start(client); switch (i_stream_read(client->input)) { case -1: /* disconnected */ @@ -77,7 +76,6 @@ static void client_input_append(struct client_command_context *cmd) client_send_command_error(cmd, "Too long argument."); cmd->param_error = TRUE; client_command_free(&cmd); - client_log_stop(); return; } @@ -94,7 +92,6 @@ static void client_input_append(struct client_command_context *cmd) client_destroy(client, NULL); else client_continue_pending_input(client); - client_log_stop(); } /* Returns -1 = error, 0 = need more data, 1 = successful. flags and diff --git a/src/imap/cmd-idle.c b/src/imap/cmd-idle.c index a2baed422b..3ca259481e 100644 --- a/src/imap/cmd-idle.c +++ b/src/imap/cmd-idle.c @@ -82,7 +82,6 @@ static void idle_client_input_more(struct cmd_idle_context *ctx) return; } - client_log_start(client); while ((line = i_stream_next_line(client->input)) != NULL) { if (client->input_skip_line) client->input_skip_line = FALSE; @@ -93,7 +92,6 @@ static void idle_client_input_more(struct cmd_idle_context *ctx) break; } } - client_log_stop(); } static void idle_client_input(struct cmd_idle_context *ctx) @@ -146,11 +144,9 @@ static void idle_callback(struct mailbox *box, struct cmd_idle_context *ctx) ctx->sync_pending = TRUE; else { ctx->manual_cork = TRUE; - client_log_start(client); idle_sync_now(box, ctx); if (client->disconnected) client_destroy(client, NULL); - client_log_stop(); } } diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c index 82154c3771..7305d295aa 100644 --- a/src/imap/imap-client.c +++ b/src/imap/imap-client.c @@ -25,8 +25,6 @@ struct imap_module_register imap_module_register = { 0 }; struct client *imap_clients = NULL; unsigned int imap_client_count = 0; -static struct mail_user *log_prefix_user = NULL; - static void client_idle_timeout(struct client *client) { if (client->output_lock == NULL) @@ -97,7 +95,6 @@ struct client *client_create(int fd_in, int fd_out, struct mail_user *user, if (hook_client_created != NULL) hook_client_created(&client); - log_prefix_user = client->user; imap_refresh_proctitle(); return client; } @@ -135,29 +132,6 @@ void client_command_cancel(struct client_command_context **_cmd) } } -void client_log_start(struct client *client) -{ - /* FIXME: This is kind of ugly way to do it here manually. Would be - better if this was integrated to ioloop, so that all io/timeout - callbacks could set the prefixes automatically */ - if (log_prefix_user != NULL && - log_prefix_user == client->user) - return; - - mail_user_set_log_prefix(client->user); - log_prefix_user = client->user; -} - -void client_log_stop(void) -{ - if (imap_client_count == 1) - client_log_start(imap_clients); - else { - master_service_init_log(master_service, "imap: "); - log_prefix_user = NULL; - } -} - static const char *client_stats(struct client *client) { static struct var_expand_table static_tab[] = { @@ -195,7 +169,6 @@ void client_destroy(struct client *client, const char *reason) i_assert(!client->destroyed); client->destroyed = TRUE; - client_log_start(client); if (!client->disconnected) { client->disconnected = TRUE; if (reason == NULL) @@ -258,7 +231,6 @@ void client_destroy(struct client *client, const char *reason) mail_storage_service_user_free(&client->service_user); pool_unref(&client->pool); - client_log_stop(); master_service_client_connection_destroyed(master_service); imap_refresh_proctitle(); } @@ -275,7 +247,6 @@ void client_disconnect(struct client *client, const char *reason) if (client->disconnected) return; - client_log_start(client); i_info("Disconnected: %s %s", reason, client_stats(client)); client->disconnected = TRUE; (void)o_stream_flush(client->output); @@ -817,8 +788,6 @@ void client_input(struct client *client) i_assert(client->io != NULL); - client_log_start(client); - client->last_input = ioloop_time; timeout_reset(client->to_idle); @@ -850,7 +819,6 @@ void client_input(struct client *client) client_destroy(client, NULL); else client_continue_pending_input(client); - client_log_stop(); } static void client_output_cmd(struct client_command_context *cmd) @@ -875,7 +843,6 @@ int client_output(struct client *client) i_assert(!client->destroyed); - client_log_start(client); client->last_output = ioloop_time; timeout_reset(client->to_idle); if (client->to_idle_output != NULL) @@ -920,7 +887,6 @@ int client_output(struct client *client) client_destroy(client, NULL); else client_continue_pending_input(client); - client_log_stop(); return ret; } diff --git a/src/imap/imap-client.h b/src/imap/imap-client.h index af49e0a554..57fc747055 100644 --- a/src/imap/imap-client.h +++ b/src/imap/imap-client.h @@ -209,9 +209,6 @@ void client_input(struct client *client); bool client_handle_input(struct client *client); int client_output(struct client *client); -void client_log_start(struct client *client); -void client_log_stop(void); - void clients_destroy_all(void); #endif diff --git a/src/imap/imap-search.c b/src/imap/imap-search.c index 9aff17b029..6c6b842fe5 100644 --- a/src/imap/imap-search.c +++ b/src/imap/imap-search.c @@ -425,7 +425,6 @@ static void cmd_search_more_callback(struct client_command_context *cmd) struct client *client = cmd->client; bool finished; - client_log_start(client); o_stream_cork(client->output); finished = cmd_search_more(cmd); o_stream_uncork(client->output); @@ -440,7 +439,6 @@ static void cmd_search_more_callback(struct client_command_context *cmd) client_destroy(client, NULL); else client_continue_pending_input(client); - client_log_stop(); } int cmd_search_parse_return_if_found(struct imap_search_context *ctx, diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c index b5b4d9f891..693f86173f 100644 --- a/src/pop3/pop3-client.c +++ b/src/pop3/pop3-client.c @@ -39,34 +39,9 @@ struct client *pop3_clients; unsigned int pop3_client_count; -static struct mail_user *log_prefix_user = NULL; - static void client_input(struct client *client); static int client_output(struct client *client); -static void client_log_start(struct client *client) -{ - /* FIXME: This is kind of ugly way to do it here manually. Would be - better if this was integrated to ioloop, so that all io/timeout - callbacks could set the prefixes automatically */ - if (log_prefix_user != NULL && - log_prefix_user == client->user) - return; - - mail_user_set_log_prefix(client->user); - log_prefix_user = client->user; -} - -static void client_log_stop(void) -{ - if (pop3_client_count == 1) - client_log_start(pop3_clients); - else { - master_service_init_log(master_service, "pop3: "); - log_prefix_user = NULL; - } -} - static void client_commit_timeout(struct client *client) { if (client->cmd != NULL) { @@ -355,7 +330,6 @@ struct client *client_create(int fd_in, int fd_out, struct mail_user *user, if (hook_client_created != NULL) hook_client_created(&client); - log_prefix_user = client->user; pop3_refresh_proctitle(); return client; } @@ -454,7 +428,6 @@ void client_destroy(struct client *client, const char *reason) if (client->seen_change_count > 0) client_update_mails(client); - client_log_start(client); if (!client->disconnected) { if (reason == NULL) reason = client_get_disconnect_reason(client); @@ -507,7 +480,6 @@ void client_destroy(struct client *client, const char *reason) mail_storage_service_user_free(&client->service_user); i_free(client); - client_log_stop(); master_service_client_connection_destroyed(master_service); pop3_refresh_proctitle(); } @@ -652,7 +624,6 @@ static void client_input(struct client *client) if (client->to_commit != NULL) timeout_reset(client->to_commit); - client_log_start(client); switch (i_stream_read(client->input)) { case -1: /* disconnected */ @@ -666,12 +637,10 @@ static void client_input(struct client *client) } (void)client_handle_input(client); - client_log_stop(); } static int client_output(struct client *client) { - client_log_start(client); o_stream_cork(client->output); if (o_stream_flush(client->output) < 0) { client_destroy(client, NULL); @@ -685,7 +654,6 @@ static int client_output(struct client *client) if (client->cmd != NULL) client->cmd(client); - client_log_stop(); if (client->cmd == NULL) { if (o_stream_get_buffer_used_size(client->output) <