X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e42c9458c2f1e3a78d6d45e99741d6edb38fc0cc..106005004ec79d27c897a338a80eca8941208914:/log.c

diff --git a/log.c b/log.c
index 8be3605a..a5867932 100644
--- a/log.c
+++ b/log.c
@@ -23,6 +23,76 @@
   */
 #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 void logit(int priority, char *buf)
+{
+	if (logfile) {
+		fprintf(logfile,"%s  %s", timestring(), buf);
+		fflush(logfile);
+	} else {
+		syslog(priority, "%s", buf);
+	}
+}
+
+void log_open(void)
+{
+	static int initialised;
+	int options = LOG_PID;
+	time_t t;
+
+	if (initialised) return;
+	initialised = 1;
+
+	if (lp_log_file()) {
+		logfile = fopen(lp_log_file(), "a");
+		return;
+	}
+
+#ifdef LOG_NDELAY
+	options |= LOG_NDELAY;
+#endif
+
+#ifdef LOG_DAEMON
+	openlog("rsyncd", options, lp_syslog_facility());
+#else
+	openlog("rsyncd", options);
+#endif
+
+#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);
+}
+		
 
 /* this is the rsync debugging function. Call it with FINFO or FERROR */
 void rprintf(int fd, const char *format, ...)
@@ -32,6 +102,12 @@ void rprintf(int fd, const char *format, ...)
 	int len;
 	FILE *f=NULL;
 	extern int am_daemon;
+	/* recursion can happen with certain fatal conditions */
+	static int depth;
+
+	if (depth) return;
+
+	depth++;
 
 	va_start(ap, format);
 	len = vslprintf(buf, sizeof(buf)-1, format, ap);
@@ -43,21 +119,22 @@ void rprintf(int fd, const char *format, ...)
 
 	buf[len] = 0;
 
+	if (fd == FLOG) {
+		if (am_daemon) logit(LOG_INFO, buf);
+		depth--;
+		return;
+	}
+
 	if (am_daemon) {
-		static int initialised;
 		int priority = LOG_INFO;
 		if (fd == FERROR) priority = LOG_WARNING;
 
-		if (!initialised) {
-			initialised = 1;
-#ifdef LOG_DAEMON
-			openlog("rsyncd", LOG_PID, lp_syslog_facility());
-#else
-			openlog("rsyncd", LOG_PID);
-#endif
+		log_open();
+		if (!io_multiplex_write(fd, buf, strlen(buf))) {
+			logit(priority, buf);
 		}
-		
-		syslog(priority, "%s", buf);
+
+		depth--;
 		return;
 	}
 
@@ -76,6 +153,10 @@ void rprintf(int fd, const char *format, ...)
 	if (!f) exit_cleanup(1);
 
 	if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+
+	if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+
+	depth--;
 }
 
 void rflush(int fd)
@@ -103,3 +184,36 @@ void rflush(int fd)
 	fflush(f);
 }
 
+
+/* log the outgoing transfer of a file */
+void log_send(struct file_struct *file)
+{
+	extern int module_id;
+	if (lp_transfer_logging(module_id)) {
+		rprintf(FLOG,"Sending %s [%s] %.0f %s\n",
+			client_name(0), client_addr(0),
+			(double)file->length, f_name(file));
+	}
+}
+
+/* log the incoming transfer of a file */
+void log_recv(struct file_struct *file)
+{
+	extern int module_id;
+	if (lp_transfer_logging(module_id)) {
+		rprintf(FLOG,"Receiving %s [%s] %.0f %s\n",
+			client_name(0), client_addr(0),
+			(double)file->length, f_name(file));
+	}
+}
+
+/* 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)
+{
+	extern int verbose;
+
+	if (!verbose) return;
+
+	rprintf(FINFO,"%s\n", fname);
+}