Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7062:36402809db43 HEAD
When aborting queued requests, log the reason for it.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 29 Dec 2007 16:57:08 +0200 |
| parents | 4ff39d30aa4a |
| children | f9fa0f38cb0e |
| files | src/auth/db-ldap.c |
| diffstat | 1 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/db-ldap.c Sat Dec 29 07:33:09 2007 +0200 +++ b/src/auth/db-ldap.c Sat Dec 29 16:57:08 2007 +0200 @@ -399,7 +399,8 @@ static void db_ldap_abort_requests(struct ldap_connection *conn, unsigned int max_count, - unsigned int timeout_secs) + unsigned int timeout_secs, + bool error, const char *reason) { struct ldap_request *const *requestp, *request; time_t diff; @@ -420,6 +421,13 @@ i_assert(conn->pending_count > 0); conn->pending_count--; } + if (error) { + auth_request_log_error(request->auth_request, "ldap", + "%s", reason); + } else { + auth_request_log_info(request->auth_request, "ldap", + "%s", reason); + } request->callback(conn, request, NULL); max_count--; } @@ -482,7 +490,8 @@ if (i > 0) { /* see if there are timed out requests */ db_ldap_abort_requests(conn, i, - DB_LDAP_REQUEST_LOST_TIMEOUT_SECS); + DB_LDAP_REQUEST_LOST_TIMEOUT_SECS, + TRUE, "Request lost"); } } @@ -706,7 +715,8 @@ static void db_ldap_disconnect_timeout(struct ldap_connection *conn) { db_ldap_abort_requests(conn, -1U, - DB_LDAP_REQUEST_DISCONNECT_TIMEOUT_SECS); + DB_LDAP_REQUEST_DISCONNECT_TIMEOUT_SECS, + FALSE, "LDAP server not connected"); if (queue_count(conn->request_queue) == 0) { /* no requests left, remove this timeout handler */ @@ -1098,7 +1108,7 @@ } } - db_ldap_abort_requests(conn, -1U, 0); + db_ldap_abort_requests(conn, -1U, 0, FALSE, "Shutting down"); i_assert(conn->pending_count == 0); db_ldap_conn_close(conn); i_assert(conn->to == NULL);