added a perl script to summarise the rsyncd log format

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 21b5c1c..d09094c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -97,8 +97,8 @@ void log_open(void)
 }
                
 
-/* 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];
@@ -106,11 +106,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);
@@ -124,14 +119,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);
@@ -158,8 +157,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)
@@ -171,6 +168,10 @@ void rflush(int fd)
                return;
        }
 
+       if (fd == FLOG) {
+               return;
+       } 
+
        if (fd == FERROR) {
                f = stderr;
        } 
@@ -188,14 +189,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,"Sending %s [%s] %.0f %s\n",
-                       client_name(0), client_addr(0),
-                       (double)file->length, f_name(file));
+               log_formatted("send", file);
        }
 }
 
@@ -204,9 +263,7 @@ 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_formatted("recv", file);
        }
 }