put the pid on each line of the log file to facilitate

auto-parsing. Requested by Jarkko Hietaniemi (jhi@iki.fi)

diff --git a/cleanup.c b/cleanup.c
index b4eac0c..ee2fa4d 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -57,6 +57,9 @@ void exit_cleanup(int code)
                        unlink(lp_pid_file());
                }
        }
+
+       if (code) log_exit(code);
+
        exit(code);
 }
 

diff --git a/log.c b/log.c
index a3f7787..3172df6 100644 (file)
--- a/log.c
+++ b/log.c
@@ -192,8 +192,8 @@ 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),
+               rprintf(FLOG,"%d Sending %s [%s] %.0f %s\n",
+                       (int)getpid(), client_name(0), client_addr(0),
                        (double)file->length, f_name(file));
        }
 }
@@ -203,12 +203,27 @@ 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),
+               rprintf(FLOG,"%d Receiving %s [%s] %.0f %s\n",
+                       (int)getpid(), client_name(0), client_addr(0),
                        (double)file->length, f_name(file));
        }
 }
 
+/* called when the transfer is interrupted for some reason */
+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(),
+                       (double)stats.total_written,
+                       (double)stats.total_read,
+                       (double)stats.total_size);
+       } else {
+               rprintf(FLOG,"%d transfer interrupted\n", (int)getpid());
+       }
+}
+
 /* 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)
@@ -219,3 +234,4 @@ void log_transfer(struct file_struct *file, char *fname)
 
        rprintf(FINFO,"%s\n", fname);
 }
+

diff --git a/main.c b/main.c
index 146f1e5..00ccd8e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -36,10 +36,7 @@ static void report(int f)
        extern int do_stats;
 
        if (am_daemon) {
-               rprintf(FLOG,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
-                      (double)stats.total_written,
-                      (double)stats.total_read,
-                      (double)stats.total_size);
+               log_exit(0);
                if (f == -1 || !am_sender) return;
        }