Improve the timeout messages.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 7f023fc..c22b65f 100644 (file)
--- a/io.c
+++ b/io.c
@@ -38,7 +38,6 @@ extern int bwlimit;
 extern size_t bwlimit_writemax;
 extern int io_timeout;
 extern int am_server;
-extern int am_daemon;
 extern int am_sender;
 extern int am_generator;
 extern int msgs2stderr;
@@ -168,10 +167,10 @@ static void check_timeout(void)
        t = time(NULL);
 
        if (t - last_io_in >= io_timeout) {
-               if (!am_server && !am_daemon) {
-                       rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
-                               (int)(t-last_io_in));
-               }
+               if (am_server)
+                       msgs2stderr = 1;
+               rprintf(FERROR, "[%s] io timeout after %d seconds -- exiting\n",
+                       who_am_i(), (int)(t-last_io_in));
                exit_cleanup(RERR_TIMEOUT);
        }
 }
@@ -1534,7 +1533,7 @@ static void read_a_msg(void)
                        goto invalid_msg;
                iobuf.in_multiplexed = 1;
                if (DEBUG_GTE(EXIT, 3))
-                       rprintf(FINFO, "[%s] got MSG_ERROR_EXIT with %d bytes\n", who_am_i(), msg_bytes);
+                       rprintf(FINFO, "[%s] got MSG_ERROR_EXIT with %ld bytes\n", who_am_i(), (long)msg_bytes);
                if (msg_bytes == 0) {
                        if (!am_sender && !am_generator) {
                                if (DEBUG_GTE(EXIT, 3)) {