#include "rsync.h"
static FILE *logfile;
-
-
-/****************************************************************************
- return the date and time as a string
-****************************************************************************/
-static char *timestring(void )
-{
- static char TimeBuf[200];
- time_t t = time(NULL);
- struct tm *tm = localtime(&t);
-
-#ifdef HAVE_STRFTIME
- strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %T",tm);
-#else
- strlcpy(TimeBuf, asctime(tm), sizeof(TimeBuf)-1);
-#endif
-
- if (TimeBuf[strlen(TimeBuf)-1] == '\n') {
- TimeBuf[strlen(TimeBuf)-1] = 0;
- }
-
- return(TimeBuf);
-}
+static int log_error_fd = -1;
static void logit(int priority, char *buf)
{
if (logfile) {
fprintf(logfile,"%s [%d] %s",
- timestring(), (int)getpid(), buf);
+ timestring(time(NULL)), (int)getpid(), buf);
fflush(logfile);
} else {
syslog(priority, "%s", buf);
if (initialised) return;
initialised = 1;
+ /* this looks pointless, but it is needed in order for the
+ C library on some systems to fetch the timezone info
+ before the chroot */
+ t = time(NULL);
+ 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;
}
#ifndef LOG_NDELAY
logit(LOG_INFO,"rsyncd started\n");
#endif
+}
- /* this looks pointless, but it is needed in order for the
- C library on some systems to fetch the timezone info
- before the chroot */
- t = time(NULL);
- localtime(&t);
+/* 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 rsync debugging function. Call it with FINFO, FERROR or FLOG */
- void rprintf(int fd, const char *format, ...)
+/* 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 quiet;
/* recursion can happen with certain fatal conditions */
- static int depth;
- if (depth) return;
+ if (quiet != 0 && code == FINFO) return;
- depth++;
-
- va_start(ap, format);
- len = vslprintf(buf, sizeof(buf)-1, format, ap);
- va_end(ap);
-
- if (len < 0) exit_cleanup(1);
-
- if (len > sizeof(buf)-1) exit_cleanup(1);
+ if (len < 0) exit_cleanup(RERR_MESSAGEIO);
buf[len] = 0;
- if (fd == FLOG) {
+ if (code == FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
- depth--;
return;
}
+ if (io_error_write(log_error_fd, code, buf, strlen(buf))) 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))) {
+ if (!io_multiplex_write(code, buf, strlen(buf))) {
logit(priority, buf);
}
return;
}
- if (fd == FERROR) {
+ if (code == FERROR) {
f = stderr;
}
- if (fd == FINFO) {
+ if (code == FINFO) {
extern int am_server;
if (am_server)
f = stderr;
f = stdout;
}
- if (!f) exit_cleanup(1);
+ if (!f) exit_cleanup(RERR_MESSAGEIO);
- if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+ if (fwrite(buf, len, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO);
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;
- depth--;
+ 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;
f = stdout;
}
- if (!f) exit_cleanup(1);
+ if (!f) exit_cleanup(RERR_MESSAGEIO);
fflush(f);
}
/* a generic logging routine for send/recv, with parameter
substitiution */
-static void log_formatted(char *op, struct file_struct *file)
+static void log_formatted(int fd,
+ char *format, char *op, struct file_struct *file,
+ struct stats *initial_stats)
{
extern int module_id;
+ extern char *auth_user;
char buf[1024];
+ char buf2[1024];
char *p, *s, *n;
- char buf2[100];
int l;
+ extern struct stats stats;
+ extern int am_sender;
+ extern int am_daemon;
+ int64 b;
- strlcpy(buf, lp_log_format(module_id), 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': n = f_name(file); break;
+ case 'f':
+ slprintf(buf2, sizeof(buf2), "%s/%s",
+ file->basedir?file->basedir:"",
+ f_name(file));
+ clean_fname(buf2);
+ n = buf2;
+ if (*n == '/') n++;
+ break;
+ case 'm': n = lp_name(module_id); break;
+ case 't': n = timestring(time(NULL)); break;
+ case 'P': n = lp_path(module_id); break;
+ case 'u': n = auth_user; break;
+ case 'b':
+ if (am_sender) {
+ b = stats.total_written -
+ initial_stats->total_written;
+ } else {
+ b = stats.total_read -
+ initial_stats->total_read;
+ }
+ slprintf(buf2,sizeof(buf2),"%.0f", (double)b);
+ n = buf2;
+ break;
+ case 'c':
+ if (!am_sender) {
+ b = stats.total_written -
+ initial_stats->total_written;
+ } else {
+ b = stats.total_read -
+ initial_stats->total_read;
+ }
+ slprintf(buf2,sizeof(buf2),"%.0f", (double)b);
+ n = buf2;
+ break;
}
if (!n) continue;
if ((l-1) + ((int)(s - &buf[0])) > sizeof(buf)) {
rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
p[0]);
- exit_cleanup(1);
+ exit_cleanup(RERR_MESSAGEIO);
}
if (l != 2) {
- memmove(s+(l-1), s+1, strlen(s+1));
+ memmove(s+(l-1), s+1, strlen(s+1)+1);
}
memcpy(p, n, l);
s = p+l;
}
- rprintf(FLOG,"%s\n", buf);
+ rprintf(fd,"%s\n", buf);
}
/* log the outgoing transfer of a file */
-void log_send(struct file_struct *file)
+void log_send(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
+ extern int am_server;
+ extern char *log_format;
+
if (lp_transfer_logging(module_id)) {
- log_formatted("send", file);
+ log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+ } else if (log_format && !am_server) {
+ log_formatted(FINFO, log_format, "send", file, initial_stats);
}
}
/* log the incoming transfer of a file */
-void log_recv(struct file_struct *file)
+void log_recv(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
+ extern int am_server;
+ extern char *log_format;
+
if (lp_transfer_logging(module_id)) {
- log_formatted("recv", file);
+ log_formatted(FLOG, lp_log_format(module_id), "recv", file, initial_stats);
+ } else if (log_format && !am_server) {
+ 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\n");
+ rprintf(FLOG,"transfer interrupted (code %d) at %s(%d)\n",
+ code, file, line);
}
}
/* log the incoming transfer of a file for interactive use, this
- will be called at the end where the client was run */
-void log_transfer(struct file_struct *file, char *fname)
+ will be called at the end where the client was run
+
+ it i called when a file starts to be transferred
+*/
+void log_transfer(struct file_struct *file, const char *fname)
{
extern int verbose;
git.samba.org / rsync.git / blobdiff