summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-04-09 02:32:18 +0000
committerAndrew Tridgell <tridge@samba.org>2000-04-09 02:32:18 +0000
commit0adb99b9dcbc5f5dbb0ee0ffb95df8b3710fcc22 (patch)
tree1183e0a9eb962b7bec967f12b54fb880a6bdc704
parent36349ea0bea8eb341b69a90792ec2147fde19573 (diff)
downloadrsync-0adb99b9dcbc5f5dbb0ee0ffb95df8b3710fcc22.tar.gz
don't pprint the IO timeout message if we are a server or daemon (can
cause recursive error messages)
-rw-r--r--io.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/io.c b/io.c
index 6a55576d..fbaf6a3a 100644
--- a/io.c
+++ b/io.c
@@ -49,6 +49,7 @@ void setup_readbuffer(int f_in)
static void check_timeout(void)
{
+ extern int am_server, am_daemon;
time_t t;
if (!io_timeout) return;
@@ -61,8 +62,10 @@ static void check_timeout(void)
t = time(NULL);
if (last_io && io_timeout && (t-last_io) >= io_timeout) {
- rprintf(FERROR,"io timeout after %d second - exiting\n",
- (int)(t-last_io));
+ if (!am_server && !am_daemon) {
+ rprintf(FERROR,"io timeout after %d second - exiting\n",
+ (int)(t-last_io));
+ }
exit_cleanup(RERR_TIMEOUT);
}
}