From fb49d3deb30ab4a9243530c2918783cf803dc063 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Wed, 27 Feb 2019 21:34:33 +0100 Subject: [PATCH] lib: connection - Remove existing log prefix. It is often redundant to the parent event's log prefix. Subsequent commits will yield a better and more generic solution. --- src/lib/connection.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/lib/connection.c b/src/lib/connection.c index b6e152198f..98c9a92c4f 100644 --- a/src/lib/connection.c +++ b/src/lib/connection.c @@ -515,9 +515,6 @@ void connection_init_server(struct connection_list *list, connection_init_full(list, conn, name, fd_in, fd_out); - event_set_append_log_prefix(conn->event, - t_strdup_printf("(%s): ", conn->name)); - struct event_passthrough *e = event_create_passthrough(conn->event)-> set_name("client_connection_connected"); /* fd_out differs from fd_in only for stdin/stdout. Keep the logging @@ -550,9 +547,6 @@ void connection_init_client_fd(struct connection_list *list, connection_init_full(list, conn, name, fd_in, fd_out); - event_set_append_log_prefix(conn->event, - t_strdup_printf("(%s): ", conn->name)); - struct event_passthrough *e = event_create_passthrough(conn->event)-> set_name("server_connection_connected"); /* fd_out differs from fd_in only for stdin/stdout. Keep the logging @@ -587,8 +581,6 @@ void connection_init_client_ip_from(struct connection_list *list, event_add_str(conn->event, "client_ip", net_ip2addr(my_ip)); event_add_str(conn->event, "ip", net_ip2addr(ip)); event_add_str(conn->event, "port", dec2str(port)); - event_set_append_log_prefix(conn->event, - t_strdup_printf("(%s): ", conn->name)); } void connection_init_client_ip(struct connection_list *list, @@ -611,10 +603,6 @@ void connection_init_client_unix(struct connection_list *list, event_field_clear(conn->event, "port"); event_field_clear(conn->event, "client_ip"); event_field_clear(conn->event, "client_port"); - - event_set_append_log_prefix(conn->event, - t_strdup_printf("(%s): ", - basename(conn->name))); } void connection_init_from_streams(struct connection_list *list, @@ -640,9 +628,6 @@ void connection_init_from_streams(struct connection_list *list, connection_update_stream_names(conn); - event_set_append_log_prefix(conn->event, - t_strdup_printf("(%s): ", conn->name)); - conn->disconnected = FALSE; connection_input_resume(conn);