dovecot-2.1: doveadm proxy list: Avoid hanging if we can't conne...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/f2b7e8d8dcb3
changeset: 14097:f2b7e8d8dcb3
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Feb 09 05:21:22 2012 +0200
description:
doveadm proxy list: Avoid hanging if we can't connect to ipc socket.

diffstat:

 src/doveadm/doveadm-proxy.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r dd4626a996b6 -r f2b7e8d8dcb3 src/doveadm/doveadm-proxy.c
--- a/src/doveadm/doveadm-proxy.c	Thu Feb 09 05:16:59 2012 +0200
+++ b/src/doveadm/doveadm-proxy.c	Thu Feb 09 05:21:22 2012 +0200
@@ -74,9 +74,11 @@
 	doveadm_print_header("dest-ip", "dest ip", 0);
 	doveadm_print_header("dest-port", "port", 0);
 
+	io_loop_set_running(current_ioloop);
 	ipc_client_cmd(ctx->ipc, "proxy\t*\tLIST",
 		       cmd_proxy_list_callback, NULL);
-	io_loop_run(current_ioloop);
+	if (io_loop_is_running(current_ioloop))
+		io_loop_run(current_ioloop);
 	ipc_client_deinit(&ctx->ipc);
 }