From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 8 Nov 2019 16:11:32 +0000 (+0100)
Subject: lib-http: server: Replace i_error() with e_error().
X-Git-Tag: 2.3.11.2~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eff369d04027d97af89d27e6b59e782eac3b3264;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: server: Replace i_error() with e_error().
---

diff --git a/src/lib-http/http-server-connection.c b/src/lib-http/http-server-connection.c
index 4982a4ee08..f6de2c78a5 100644
--- a/src/lib-http/http-server-connection.c
+++ b/src/lib-http/http-server-connection.c
@@ -1108,17 +1108,19 @@ http_server_connection_create(struct http_server *server,
 		net_set_nonblock(fd_out, TRUE);
 	(void)net_set_tcp_nodelay(fd_out, TRUE);
 
-	if (set->socket_send_buffer_size > 0) {
-		if (net_set_send_buffer_size(fd_out,
-			set->socket_send_buffer_size) < 0)
-			i_error("net_set_send_buffer_size(%zu) failed: %m",
-				set->socket_send_buffer_size);
+	if (set->socket_send_buffer_size > 0 &&
+	    net_set_send_buffer_size(fd_out,
+				     set->socket_send_buffer_size) < 0) {
+		e_error(conn->event,
+			"net_set_send_buffer_size(%zu) failed: %m",
+			set->socket_send_buffer_size);
 	}
-	if (set->socket_recv_buffer_size > 0) {
-		if (net_set_recv_buffer_size(fd_in,
-			set->socket_recv_buffer_size) < 0)
-			i_error("net_set_recv_buffer_size(%zu) failed: %m",
-				set->socket_recv_buffer_size);
+	if (set->socket_recv_buffer_size > 0 &&
+	    net_set_recv_buffer_size(fd_in,
+				     set->socket_recv_buffer_size) < 0) {
+		e_error(conn->event,
+			"net_set_recv_buffer_size(%zu) failed: %m",
+			set->socket_recv_buffer_size);
 	}
 
 	conn_event = event_create(server->event);
diff --git a/src/lib-http/http-server-response.c b/src/lib-http/http-server-response.c
index f77ef30f99..27b7a4f2b4 100644
--- a/src/lib-http/http-server-response.c
+++ b/src/lib-http/http-server-response.c
@@ -184,7 +184,7 @@ void http_server_response_set_payload(struct http_server_response *resp,
 	resp->payload_input = input;
 	if ((ret = i_stream_get_size(input, TRUE, &resp->payload_size)) <= 0) {
 		if (ret < 0) {
-			i_error("i_stream_get_size(%s) failed: %s",
+			e_error(resp->event, "i_stream_get_size(%s) failed: %s",
 				i_stream_get_name(input),
 				i_stream_get_error(input));
 		}