X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9b73d1c0e9ca979700493337d0a87497b882d811..958f373550a93532a2df9c7f5242befb29f3a6e8:/log.c

diff --git a/log.c b/log.c
index 3172df64..30aca47e 100644
--- a/log.c
+++ b/log.c
@@ -51,7 +51,8 @@ static char *timestring(void )
 static void logit(int priority, char *buf)
 {
 	if (logfile) {
-		fprintf(logfile,"%s  %s", timestring(), buf);
+		fprintf(logfile,"%s [%d] %s", 
+			timestring(), (int)getpid(), buf);
 		fflush(logfile);
 	} else {
 		syslog(priority, "%s", buf);
@@ -68,6 +69,13 @@ void log_open(void)
 	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) {
 		logfile = fopen(logf, "a");
@@ -87,17 +95,11 @@ void log_open(void)
 #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, ...)
+/* 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];
@@ -105,11 +107,6 @@ void rprintf(int fd, const char *format, ...)
 	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);
@@ -123,14 +120,18 @@ void rprintf(int fd, const char *format, ...)
 
 	if (fd == FLOG) {
 		if (am_daemon) logit(LOG_INFO, buf);
-		depth--;
 		return;
 	}
 
 	if (am_daemon) {
+		static int depth;
 		int priority = LOG_INFO;
 		if (fd == FERROR) priority = LOG_WARNING;
 
+		if (depth) return;
+
+		depth++;
+
 		log_open();
 		if (!io_multiplex_write(fd, buf, strlen(buf))) {
 			logit(priority, buf);
@@ -157,8 +158,6 @@ void rprintf(int fd, const char *format, ...)
 	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)
@@ -170,6 +169,10 @@ void rflush(int fd)
 		return;
 	}
 
+	if (fd == FLOG) {
+		return;
+	} 
+
 	if (fd == FERROR) {
 		f = stderr;
 	} 
@@ -187,14 +190,72 @@ void rflush(int fd)
 }
 
 
+
+/* a generic logging routine for send/recv, with parameter
+   substitiution */
+static void log_formatted(char *op, struct file_struct *file)
+{
+	extern int module_id;
+	extern char *auth_user;
+	char buf[1024];
+	char *p, *s, *n;
+	char buf2[100];
+	int l;
+
+	strlcpy(buf, lp_log_format(module_id), sizeof(buf)-1);
+	
+	for (s=&buf[0]; 
+	     s && (p=strchr(s,'%')); ) {
+		n = NULL;
+		s = p + 1;
+
+		switch (p[1]) {
+		case 'h': n = client_name(0); break;
+		case 'a': n = client_addr(0); break;
+		case 'l': 
+			slprintf(buf2,sizeof(buf2)-1,"%.0f", 
+				 (double)file->length); 
+			n = buf2;
+			break;
+		case 'p': 
+			slprintf(buf2,sizeof(buf2)-1,"%d", 
+				 (int)getpid()); 
+			n = buf2;
+			break;
+		case 'o': n = op; break;
+		case 'f': n = f_name(file); break;
+		case 'm': n = lp_name(module_id); break;
+		case 'P': n = lp_path(module_id); break;
+		case 'u': n = auth_user; break;
+		}
+
+		if (!n) continue;
+
+		l = strlen(n);
+
+		if ((l-1) + ((int)(s - &buf[0])) > sizeof(buf)) {
+			rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
+				p[0]);
+			exit_cleanup(1);
+		}
+
+		if (l != 2) {
+			memmove(s+(l-1), s+1, strlen(s+1)+1);
+		}
+		memcpy(p, n, l);
+
+		s = p+l;
+	}
+
+	rprintf(FLOG,"%s\n", buf);
+}
+
 /* 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,"%d Sending %s [%s] %.0f %s\n",
-			(int)getpid(), client_name(0), client_addr(0),
-			(double)file->length, f_name(file));
+		log_formatted("send", file);
 	}
 }
 
@@ -203,9 +264,7 @@ void log_recv(struct file_struct *file)
 {
 	extern int module_id;
 	if (lp_transfer_logging(module_id)) {
-		rprintf(FLOG,"%d Receiving %s [%s] %.0f %s\n",
-			(int)getpid(), client_name(0), client_addr(0),
-			(double)file->length, f_name(file));
+		log_formatted("recv", file);
 	}
 }
 
@@ -214,13 +273,12 @@ void log_exit(int code)
 {
 	if (code == 0) {
 		extern struct stats stats;		
-		rprintf(FLOG,"%d wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
-			(int)getpid(),
+		rprintf(FLOG,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
 			(double)stats.total_written,
 			(double)stats.total_read,
 			(double)stats.total_size);
 	} else {
-		rprintf(FLOG,"%d transfer interrupted\n", (int)getpid());
+		rprintf(FLOG,"transfer interrupted\n");
 	}
 }