extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
-extern int log_format_has_i;
-extern int log_format_has_o_or_i;
+extern int stdout_format_has_i;
+extern int stdout_format_has_o_or_i;
+extern int logfile_format_has_i;
extern int logfile_format_has_o_or_i;
extern mode_t orig_umask;
extern char *auth_user;
-extern char *log_format;
+extern char *stdout_format;
extern char *logfile_format;
extern char *logfile_name;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
extern iconv_t ic_chck;
#endif
+extern char curr_dir[];
+extern unsigned int module_dirlen;
static int log_initialised;
static int logfile_was_closed;
#endif
#ifdef LOG_DAEMON
- openlog("rsyncd", options, lp_syslog_facility());
+ openlog("rsyncd", options, lp_syslog_facility(module_id));
#else
openlog("rsyncd", options);
#endif
}
}
-void log_init(void)
+void log_init(int restart)
{
- if (log_initialised)
- return;
- log_initialised = 1;
+ if (log_initialised) {
+ if (!restart)
+ return;
+ if (strcmp(logfile_name, lp_log_file(module_id)) != 0) {
+ if (logfile_fp) {
+ fclose(logfile_fp);
+ logfile_fp = NULL;
+ } else
+ closelog();
+ logfile_name = NULL;
+ } else if (*logfile_name)
+ return; /* unchanged, non-empty "log file" names */
+ else if (lp_syslog_facility(-1) != lp_syslog_facility(module_id))
+ closelog();
+ else
+ return; /* unchanged syslog settings */
+ } else
+ log_initialised = 1;
/* This looks pointless, but it is needed in order for the
* C library on some systems to fetch the timezone info
/* Optionally use a log file instead of syslog. (Non-daemon
* rsyncs will have already set logfile_name, as needed.) */
if (am_daemon && !logfile_name)
- logfile_name = lp_log_file();
+ logfile_name = lp_log_file(module_id);
if (logfile_name && *logfile_name)
logfile_open();
else
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
- if (quiet && code == FINFO)
- return;
-
if (am_server && msg_fd_out >= 0) {
/* Pass the message to our sibling. */
send_msg((enum msgcode)code, buf, len);
code = FINFO;
else if (am_daemon || logfile_name) {
static int in_block;
- char msg[2048], *s;
+ char msg[2048];
int priority = code == FERROR ? LOG_WARNING : LOG_INFO;
if (in_block)
return;
in_block = 1;
if (!log_initialised)
- log_init();
+ log_init(0);
strlcpy(msg, buf, MIN((int)sizeof msg, len + 1));
- for (s = msg; *s == '\n' && s[1]; s++) {}
- logit(priority, s);
+ logit(priority, msg);
in_block = 0;
if (code == FLOG || (am_daemon && !am_server))
} else if (code == FLOG)
return;
+ if (quiet && code != FERROR)
+ return;
+
if (am_server) {
/* Pass the message to the non-server side. */
if (send_msg((enum msgcode)code, buf, len))
case FERROR:
log_got_error = 1;
f = stderr;
- goto pre_scan;
- case FINFO:
- f = am_server ? stderr : stdout;
- pre_scan:
- while (len > 1 && *buf == '\n') {
- fputc(*buf, f);
- buf++;
- len--;
- }
break;
- case FNAME:
+ case FINFO:
f = am_server ? stderr : stdout;
break;
default:
fflush(f);
}
-/* a generic logging routine for send/recv, with parameter
- * substitiution */
+/* A generic logging routine for send/recv, with parameter substitiution. */
static void log_formatted(enum logcode code, char *format, char *op,
struct file_struct *file, struct stats *initial_stats,
int iflags, char *hlink)
strlcpy(n, buf2, MAXPATHLEN);
else
n = buf2;
- } else
- clean_fname(n, 0);
+ } else {
+ if (*n != '/') {
+ pathjoin(buf2, sizeof buf2,
+ curr_dir + module_dirlen, n);
+ clean_fname(buf2, 0);
+ if (fmt[1])
+ strlcpy(n, buf2, MAXPATHLEN);
+ else
+ n = buf2;
+ } else
+ clean_fname(n, 0);
+ }
if (*n == '/')
n++;
break;
return 0;
}
-/* log the transfer of a file */
-void log_item(struct file_struct *file, struct stats *initial_stats,
- int iflags, char *hlink)
+/* Log the transfer of a file. If the code is FCLIENT, the output just goes
+ * to stdout. If it is FLOG, it just goes to the log file. Otherwise we
+ * output to both. */
+void log_item(enum logcode code, struct file_struct *file,
+ struct stats *initial_stats, int iflags, char *hlink)
{
char *s_or_r = am_sender ? "send" : "recv";
- if (log_format && !am_server) {
- log_formatted(FNAME, log_format, s_or_r,
+ if (code != FLOG && stdout_format && !am_server) {
+ log_formatted(FCLIENT, stdout_format, s_or_r,
file, initial_stats, iflags, hlink);
- } else if (logfile_format) {
+ }
+ if (code != FCLIENT && logfile_format && *logfile_format) {
log_formatted(FLOG, logfile_format, s_or_r,
file, initial_stats, iflags, hlink);
}
{
int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
int see_item = itemizing && (significant_flags || *buf
- || log_format_has_i > 1 || (verbose > 1 && log_format_has_i));
+ || stdout_format_has_i > 1 || (verbose > 1 && stdout_format_has_i));
int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
if (am_server) {
- if (logfile_name && !dry_run && see_item)
- log_item(file, &stats, iflags, buf);
+ if (logfile_name && !dry_run && see_item
+ && (significant_flags || logfile_format_has_i))
+ log_item(FLOG, file, &stats, iflags, buf);
} else if (see_item || local_change || *buf
- || (S_ISDIR(file->mode) && significant_flags))
- log_item(file, &stats, iflags, buf);
+ || (S_ISDIR(file->mode) && significant_flags)) {
+ enum logcode code = significant_flags || logfile_format_has_i ? FINFO : FCLIENT;
+ log_item(code, file, &stats, iflags, buf);
+ }
}
void log_delete(char *fname, int mode)
file.mode = mode;
file.basename = fname;
- if (!verbose && !log_format)
+ if (!verbose && !stdout_format)
;
else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
if (S_ISDIR(mode))
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
} else {
- fmt = log_format_has_o_or_i ? log_format : "deleting %n";
+ fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n";
log_formatted(FCLIENT, fmt, "del.", &file, &stats,
ITEM_DELETED, NULL);
}