Commit 41b5b5e7 authored by Wayne Davison's avatar Wayne Davison

The log_delete() function may now be called even when the client is

not getting delete messages, which ensures that the daemon's log-
file output includes all deletions when per-file logging is enabled.
parent a3e1363a
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
*/ */
#include "rsync.h" #include "rsync.h"
extern int verbose;
extern int dry_run; extern int dry_run;
extern int am_daemon; extern int am_daemon;
extern int am_server; extern int am_server;
...@@ -534,7 +535,9 @@ void log_delete(char *fname, int mode) ...@@ -534,7 +535,9 @@ void log_delete(char *fname, int mode)
file.mode = mode; file.mode = mode;
file.basename = fname; file.basename = fname;
if (am_server && protocol_version >= 29 && len < MAXPATHLEN) { if (!verbose && !log_format)
;
else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
if (S_ISDIR(mode)) if (S_ISDIR(mode))
len++; /* directories include trailing null */ len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len); send_msg(MSG_DELETED, fname, len);
...@@ -543,7 +546,7 @@ void log_delete(char *fname, int mode) ...@@ -543,7 +546,7 @@ void log_delete(char *fname, int mode)
log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED); log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED);
} }
if (!am_daemon || dry_run) if (!am_daemon || dry_run || !lp_transfer_logging(module_id))
return; return;
fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n"; fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment