dovecot-2.0: login proxy: Error message improvements.

dovecot at dovecot.org dovecot at dovecot.org
Thu Aug 12 17:21:01 EEST 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/b9bdcfd6eaa7
changeset: 11981:b9bdcfd6eaa7
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 12 15:20:58 2010 +0100
description:
login proxy: Error message improvements.

diffstat:

 src/login-common/client-common-auth.c |  13 ++++++++++++-
 src/login-common/login-proxy.c        |   2 ++
 2 files changed, 14 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 4b59b19628b1 -r b9bdcfd6eaa7 src/login-common/client-common-auth.c
--- a/src/login-common/client-common-auth.c	Thu Aug 12 13:51:12 2010 +0100
+++ b/src/login-common/client-common-auth.c	Thu Aug 12 15:20:58 2010 +0100
@@ -179,6 +179,13 @@
 	client_auth_failed(client);
 }
 
+static const char *get_disconnect_reason(struct istream *input)
+{
+	errno = input->stream_errno;
+	return errno == 0 || errno == EPIPE ? "Connection closed" :
+		t_strdup_printf("Connection closed: %m");
+}
+
 static void proxy_input(struct client *client)
 {
 	struct istream *input;
@@ -209,7 +216,11 @@
 		client_proxy_failed(client, TRUE);
 		return;
 	case -1:
-		client_log_err(client, "proxy: Remote disconnected");
+		client_log_err(client, t_strdup_printf(
+			"proxy: Remote %s:%u disconnected: %s",
+			login_proxy_get_host(client->login_proxy),
+			login_proxy_get_port(client->login_proxy),
+			get_disconnect_reason(input)));
 		client_proxy_failed(client, TRUE);
 		return;
 	}
diff -r 4b59b19628b1 -r b9bdcfd6eaa7 src/login-common/login-proxy.c
--- a/src/login-common/login-proxy.c	Thu Aug 12 13:51:12 2010 +0100
+++ b/src/login-common/login-proxy.c	Thu Aug 12 15:20:58 2010 +0100
@@ -202,6 +202,8 @@
 	if (timeval_cmp(&rec->last_failure, &rec->last_success) > 0 &&
 	    rec->num_waiting_connections != 0) {
 		/* the server is down. fail immediately */
+		i_error("proxy(%s): Host %s:%u is down",
+			proxy->client->virtual_user, proxy->host, proxy->port);
 		login_proxy_free(&proxy);
 		return -1;
 	}


More information about the dovecot-cvs mailing list