*/
#include "rsync.h"
-extern int itemize_changes;
+extern int dry_run;
extern int am_daemon;
extern int am_server;
extern int am_sender;
extern int msg_fd_out;
extern int protocol_version;
extern int preserve_times;
+extern int log_format_has_o_or_i;
+extern int daemon_log_format_has_o_or_i;
extern char *auth_user;
extern char *log_format;
return;
}
- if (am_daemon) {
+ if (code == FCLIENT)
+ code = FINFO;
+ else if (am_daemon) {
static int in_block;
char msg[2048];
int priority = code == FERROR ? LOG_WARNING : LOG_INFO;
{
static struct file_struct file;
int len = strlen(fname);
- enum logcode code;
char *fmt;
file.mode = mode;
if (S_ISDIR(mode))
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
- if (!am_daemon)
- return;
- fmt = lp_log_format(module_id);
- code = FLOG;
} else {
- fmt = log_format && itemize_changes ? log_format : "%i %n";
- code = FINFO;
+ fmt = log_format_has_o_or_i ? log_format : "%i %n";
+ log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED);
}
- log_formatted(code, fmt, "del.", &file, &stats, ITEM_DELETED);
+ if (!am_daemon || dry_run)
+ return;
+
+ fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n";
+ log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED);
}
void log_exit(int code, const char *file, int line)
{
if (code == 0) {
- rprintf(FLOG,"wrote %.0f bytes read %.0f bytes total size %.0f\n",
+ rprintf(FLOG,"sent %.0f bytes received %.0f bytes total size %.0f\n",
(double)stats.total_written,
(double)stats.total_read,
(double)stats.total_size);