lib-http: Remove debug from http-server-settings

diff --git a/src/lib-http/http-server.c b/src/lib-http/http-server.c
index c9243f7d5c4c8d214030a10d114138771e7ae475..8e655bec6ac42516f298208be4bac2a8cbdace9c 100644 (file)
--- a/src/lib-http/http-server.c
+++ b/src/lib-http/http-server.c
@@ -55,11 +55,9 @@ struct http_server *http_server_init(const struct http_server_settings *set,
        server->set.request_hdr_max_fields = set->request_hdr_max_fields;
        server->set.socket_send_buffer_size = set->socket_send_buffer_size;
        server->set.socket_recv_buffer_size = set->socket_recv_buffer_size;
-       server->set.debug = set->debug;
 
        server->event = event_create(event_parent);
        event_add_category(server->event, &event_category_http_server);
-       event_set_forced_debug(server->event, set->debug);
        event_set_append_log_prefix(server->event, "http-server: ");
 
        server->conn_list = http_server_connection_list_init();

diff --git a/src/lib-http/http-server.h b/src/lib-http/http-server.h
index f7c12e0ad4b0871658d7c8c2546ae965792d7a0c..7ca19b415b2c3f836ad876beec5a1a92c71d0d45 100644 (file)
--- a/src/lib-http/http-server.h
+++ b/src/lib-http/http-server.h
@@ -52,9 +52,6 @@ struct http_server_settings {
           defaults are used when these settings are 0. */
        size_t socket_send_buffer_size;
        size_t socket_recv_buffer_size;
-
-       /* Enable logging debug messages */
-       bool debug;
 };
 
 

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 588eaf54f92bf291b48ad0c717f7f0339ff924fc..e0026e84d7b33618af7add5172596e2ad5c7b1d4 100644 (file)
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -1764,7 +1764,6 @@ test_init_server_settings(struct http_server_settings *server_set_r)
 {
        i_zero(server_set_r);
        server_set_r->request_max_payload_size = UOFF_T_MAX;
-       server_set_r->debug = debug;
 
        if (small_socket_buffers) {
                server_set_r->socket_send_buffer_size = 40960;
@@ -2433,6 +2432,7 @@ static void main_init(void)
        event_set_append_log_prefix(client_event, "test client: ");
        server_event = event_create(test_event);
        event_set_append_log_prefix(server_event, "test server: ");
+       event_set_forced_debug(server_event, debug);
 }
 
 static void main_deinit(void)

diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c
index bd5dcb3aa2c81cd9e8cccf163f17f6646114aa18..f78720c60c52d1c3fd7749d779f48fa161da21d3 100644 (file)
--- a/src/lib-http/test-http-server-errors.c
+++ b/src/lib-http/test-http-server-errors.c
@@ -842,7 +842,6 @@ static void test_server_defaults(struct http_server_settings *http_set)
        i_zero(http_set);
        http_set->max_client_idle_time_msecs = 5*1000;
        http_set->max_pipelined_requests = 1;
-       http_set->debug = debug;
 }
 
 /* client connection */
@@ -885,6 +884,7 @@ static void test_server_run(const struct http_server_settings *http_set)
 {
        struct timeout *to;
        struct event *event = event_create(NULL);
+       event_set_forced_debug(event, debug);
 
        to = timeout_add(SERVER_MAX_TIMEOUT_MSECS, test_server_timeout, NULL);
 

diff --git a/src/lib-http/test-http-server.c b/src/lib-http/test-http-server.c
index bbc64d4b34c5d4359974d327c4134c1f2f46e280..2e2f5ab20f6499751e9985025aacf408d11a4c9f 100644 (file)
--- a/src/lib-http/test-http-server.c
+++ b/src/lib-http/test-http-server.c
@@ -213,11 +213,10 @@ int main(int argc, char *argv[])
        i_zero(&http_set);
        http_set.max_client_idle_time_msecs = 20*1000; /* defaults to indefinite! */
        http_set.max_pipelined_requests = 4;
-       http_set.debug = debug;
 
        ioloop = io_loop_create();
        struct event *event = event_create(NULL);
-
+       event_set_forced_debug(event, debug);
        http_server = http_server_init(&http_set, event);
 
        lib_signals_init();