Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f8e1fa6
)
Improve the timeout messages.
author
Wayne Davison
<wayned@samba.org>
Tue, 15 Dec 2009 16:32:18 +0000
(08:32 -0800)
committer
Wayne Davison
<wayned@samba.org>
Tue, 15 Dec 2009 16:32:18 +0000
(08:32 -0800)
io.c
patch
|
blob
|
blame
|
history
diff --git
a/io.c
b/io.c
index
d142a1a
..
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 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;
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) {
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);
}
}
exit_cleanup(RERR_TIMEOUT);
}
}