When running as --daemon in the background and using a "log file" rsyncd.conf

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index f0ee10e..1c54a85 100644 (file)
--- a/log.c
+++ b/log.c
@@ -23,12 +23,19 @@
   */
 #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) {
+                       extern int orig_umask;
+                       int old_umask = umask(022 | orig_umask);
+                       logfile = fopen(logfname, "a");
+                       umask(old_umask);
+               }
                fprintf(logfile,"%s [%d] %s", 
                        timestring(time(NULL)), (int)getpid(), buf);
                fflush(logfile);
@@ -37,12 +44,11 @@ static void logit(int priority, char *buf)
        }
 }
 
-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;
@@ -54,13 +60,11 @@ void log_open(void)
        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)
+                       return;
+               logfname = NULL;
        }
 
 #ifdef LOG_NDELAY
@@ -78,6 +82,16 @@ void log_open(void)
 #endif
 }
 
+/* for long runs when using a log file, close it before potential long waits
+   so it can be trimmed by another process instead of growing forever */
+void log_release()
+{
+       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)
@@ -91,10 +105,11 @@ void rwrite(enum logcode code, char *buf, int len)
 {
        FILE *f=NULL;
        extern int am_daemon;
+       extern int am_server;
        extern int quiet;
        /* recursion can happen with certain fatal conditions */
 
-       if (quiet != 0 && code == FINFO) return;
+       if (quiet && code == FINFO) return;
 
        if (len < 0) exit_cleanup(RERR_MESSAGEIO);
 
@@ -105,7 +120,15 @@ void rwrite(enum logcode code, char *buf, int len)
                return;
        }
 
-       if (io_error_write(log_error_fd, code, buf, strlen(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;
@@ -116,10 +139,8 @@ void rwrite(enum logcode code, char *buf, int len)
 
                depth++;
 
-               log_open();
-               if (!io_multiplex_write(code, buf, strlen(buf))) {
-                       logit(priority, buf);
-               }
+               log_init();
+               logit(priority, buf);
 
                depth--;
                return;
@@ -130,7 +151,6 @@ void rwrite(enum logcode code, char *buf, int len)
        } 
 
        if (code == FINFO) {
-               extern int am_server;
                if (am_server) 
                        f = stderr;
                else