From 20e26464f60bda9d83c2bcb39c0f15e41c0e1468 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 30 Jul 2021 17:20:24 +0300 Subject: [PATCH] doveadm-server: Split off client_connection_log_passthrough() --- src/doveadm/client-connection-tcp.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c index 4eddcf0d5d..091ea89eef 100644 --- a/src/doveadm/client-connection-tcp.c +++ b/src/doveadm/client-connection-tcp.c @@ -234,6 +234,16 @@ static int doveadm_cmd_handle(struct client_connection_tcp *conn, return 0; } +static void client_connection_log_passthrough(struct client_connection_tcp *conn) +{ + conn->log_out = o_stream_multiplex_add_channel(conn->output, + DOVEADM_LOG_CHANNEL_ID); + o_stream_set_no_error_handling(conn->log_out, TRUE); + o_stream_set_name(conn->log_out, t_strdup_printf("%s (log)", + o_stream_get_name(conn->output))); + doveadm_server_capture_logs(); +} + static bool client_handle_command(struct client_connection_tcp *conn, const char *const *args) { @@ -423,13 +433,7 @@ client_connection_tcp_input(struct client_connection_tcp *conn) o_stream_set_name(conn->output, o_stream_get_name(os)); o_stream_set_no_error_handling(conn->output, TRUE); o_stream_unref(&os); - conn->log_out = - o_stream_multiplex_add_channel(conn->output, - DOVEADM_LOG_CHANNEL_ID); - o_stream_set_no_error_handling(conn->log_out, TRUE); - o_stream_set_name(conn->log_out, t_strdup_printf("%s (log)", - o_stream_get_name(conn->output))); - doveadm_server_capture_logs(); + client_connection_log_passthrough(conn); } doveadm_print_ostream = conn->output; } -- 2.47.3