#include "rsync.h"
static FILE *logfile;
-
+static int log_error_fd = -1;
static void logit(int priority, char *buf)
{
logit(LOG_INFO,"rsyncd started\n");
#endif
}
-
-/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
- void rprintf(int fd, const char *format, ...)
+/* setup the error file descriptor - used when we are a server
+ that is receiving files */
+void set_error_fd(int fd)
+{
+ log_error_fd = fd;
+}
+
+/* this is the underlying (unformatted) rsync debugging function. Call
+ it with FINFO, FERROR or FLOG */
+void rwrite(int fd, char *buf, int len)
{
- va_list ap;
- char buf[1024];
- int len;
FILE *f=NULL;
extern int am_daemon;
+ extern int quiet;
/* recursion can happen with certain fatal conditions */
- va_start(ap, format);
- len = vslprintf(buf, sizeof(buf), format, ap);
- va_end(ap);
+ if (quiet != 0 && fd == FINFO) return;
if (len < 0) exit_cleanup(RERR_MESSAGEIO);
- if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
-
buf[len] = 0;
if (fd == FLOG) {
depth++;
log_open();
- if (!io_multiplex_write(fd, buf, strlen(buf))) {
+
+ if (!io_error_write(log_error_fd, buf, strlen(buf)) &&
+ !io_multiplex_write(fd, buf, strlen(buf))) {
logit(priority, buf);
}
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
}
+
+
+/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
+ void rprintf(int fd, const char *format, ...)
+{
+ va_list ap;
+ char buf[1024];
+ int len;
+
+ va_start(ap, format);
+ len = vslprintf(buf, sizeof(buf), format, ap);
+ va_end(ap);
+
+ if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
+
+ rwrite(fd, buf, len);
+}
void rflush(int fd)
{
int l;
extern struct stats stats;
extern int am_sender;
+ extern int am_daemon;
int64 b;
strlcpy(buf, format, sizeof(buf));
s = p + 1;
switch (p[1]) {
- case 'h': n = client_name(0); break;
- case 'a': n = client_addr(0); break;
+ case 'h': if (am_daemon) n = client_name(0); break;
+ case 'a': if (am_daemon) n = client_addr(0); break;
case 'l':
slprintf(buf2,sizeof(buf2),"%.0f",
(double)file->length);
extern char *log_format;
if (lp_transfer_logging(module_id)) {
- log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+ log_formatted(FLOG, lp_log_format(module_id), "recv", file, initial_stats);
} else if (log_format && !am_server) {
- log_formatted(FINFO, log_format, "send", file, initial_stats);
+ log_formatted(FINFO, log_format, "recv", file, initial_stats);
}
}