*/
#include "rsync.h"
+static char *logfname;
static FILE *logfile;
-
+static int log_error_fd = -1;
static void logit(int priority, char *buf)
{
- if (logfile) {
+ if (logfname) {
+ if (!logfile)
+ log_open();
fprintf(logfile,"%s [%d] %s",
timestring(time(NULL)), (int)getpid(), buf);
fflush(logfile);
}
}
-void log_open(void)
+void log_init(void)
{
static int initialised;
int options = LOG_PID;
time_t t;
- char *logf;
if (initialised) return;
initialised = 1;
localtime(&t);
/* optionally use a log file instead of syslog */
- logf = lp_log_file();
- if (logf && *logf) {
- extern int orig_umask;
- int old_umask = umask(022 | orig_umask);
- logfile = fopen(logf, "a");
- umask(old_umask);
- return;
+ logfname = lp_log_file();
+ if (logfname) {
+ if (*logfname) {
+ log_open();
+ return;
+ }
+ logfname = NULL;
}
#ifdef LOG_NDELAY
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, ...)
+void log_open()
+{
+ if (logfname && !logfile) {
+ extern int orig_umask;
+ int old_umask = umask(022 | orig_umask);
+ logfile = fopen(logfname, "a");
+ umask(old_umask);
+ }
+}
+
+void log_close()
+{
+ if (logfile) {
+ fclose(logfile);
+ logfile = NULL;
+ }
+}
+
+/* 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(enum logcode code, char *buf, int len)
{
- va_list ap;
- char buf[1024];
- int len;
FILE *f=NULL;
extern int am_daemon;
+ extern int am_server;
+ extern int quiet;
/* recursion can happen with certain fatal conditions */
- va_start(ap, format);
- len = vslprintf(buf, sizeof(buf)-1, format, ap);
- va_end(ap);
+ if (quiet && code == FINFO) return;
if (len < 0) exit_cleanup(RERR_MESSAGEIO);
- if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
-
buf[len] = 0;
- if (fd == FLOG) {
+ if (code == FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
return;
}
+ /* first try to pass it off the our sibling */
+ if (am_server && io_error_write(log_error_fd, code, buf, len)) {
+ return;
+ }
+
+ /* then try to pass it to the other end */
+ if (am_server && io_multiplex_write(code, buf, len)) {
+ return;
+ }
+
if (am_daemon) {
static int depth;
int priority = LOG_INFO;
- if (fd == FERROR) priority = LOG_WARNING;
+ if (code == FERROR) priority = LOG_WARNING;
if (depth) return;
depth++;
- log_open();
- if (!io_multiplex_write(fd, buf, strlen(buf))) {
- logit(priority, buf);
- }
+ log_init();
+ logit(priority, buf);
depth--;
return;
}
- if (fd == FERROR) {
+ if (code == FERROR) {
f = stderr;
}
- if (fd == FINFO) {
- extern int am_server;
+ if (code == FINFO) {
if (am_server)
f = stderr;
else
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(enum logcode code, 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(code, buf, len);
+}
-void rflush(int fd)
+void rflush(enum logcode code)
{
FILE *f = NULL;
extern int am_daemon;
return;
}
- if (fd == FLOG) {
+ if (code == FLOG) {
return;
}
- if (fd == FERROR) {
+ if (code == FERROR) {
f = stderr;
}
- if (fd == FINFO) {
+ if (code == FINFO) {
extern int am_server;
if (am_server)
f = stderr;
/* a generic logging routine for send/recv, with parameter
substitiution */
-static void log_formatted(int fd,
+static void log_formatted(enum logcode code,
char *format, char *op, struct file_struct *file,
struct stats *initial_stats)
{
int l;
extern struct stats stats;
extern int am_sender;
+ extern int am_daemon;
int64 b;
- strlcpy(buf, format, sizeof(buf)-1);
+ strlcpy(buf, format, sizeof(buf));
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
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)-1,"%.0f",
+ slprintf(buf2,sizeof(buf2),"%.0f",
(double)file->length);
n = buf2;
break;
case 'p':
- slprintf(buf2,sizeof(buf2)-1,"%d",
+ slprintf(buf2,sizeof(buf2),"%d",
(int)getpid());
n = buf2;
break;
case 'o': n = op; break;
case 'f':
- slprintf(buf2, sizeof(buf2)-1, "%s/%s",
+ slprintf(buf2, sizeof(buf2), "%s/%s",
file->basedir?file->basedir:"",
f_name(file));
clean_fname(buf2);
b = stats.total_read -
initial_stats->total_read;
}
- slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b);
+ slprintf(buf2,sizeof(buf2),"%.0f", (double)b);
n = buf2;
break;
case 'c':
b = stats.total_read -
initial_stats->total_read;
}
- slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b);
+ slprintf(buf2,sizeof(buf2),"%.0f", (double)b);
n = buf2;
break;
}
s = p+l;
}
- rprintf(fd,"%s\n", buf);
+ rprintf(code,"%s\n", buf);
}
/* log the outgoing transfer of a file */
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);
}
}
/* called when the transfer is interrupted for some reason */
-void log_exit(int code)
+void log_exit(int code, const char *file, int line)
{
if (code == 0) {
extern struct stats stats;
(double)stats.total_read,
(double)stats.total_size);
} else {
- rprintf(FLOG,"transfer interrupted (code %d)\n", code);
+ rprintf(FLOG,"transfer interrupted (code %d) at %s(%d)\n",
+ code, file, line);
}
}
it i called when a file starts to be transferred
*/
-void log_transfer(struct file_struct *file, char *fname)
+void log_transfer(struct file_struct *file, const char *fname)
{
extern int verbose;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff