Attachment 33298 Details for Bug 54613 – file.diff

[patch] file.diff

file.diff (text/plain), 2.39 KB, created by Kirill Ponomarew on 2003-07-18 12:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill Ponomarew

Created: 2003-07-18 12:30:16 UTC

Size: 2.39 KB

patch

obsolete

>diff -urN logrotate.orig/files/patch-ac logrotate/files/patch-ac
>--- logrotate.orig/files/patch-ac	Thu Dec 30 13:35:51 1999
>+++ logrotate/files/patch-ac	Thu Jan  1 01:00:00 1970
>@@ -1,22 +0,0 @@
>---- logrotate.c.orig	Thu Jun 17 04:37:19 1999
>-+++ logrotate.c	Wed Dec 29 11:31:57 1999
>-@@ -1,9 +1,7 @@
>--#include <alloca.h>
>- #include <ctype.h>
>- #include <dirent.h>
>- #include <errno.h>
>- #include <fcntl.h>
>--#include <getopt.h>
>- #include <popt.h>
>- #include <stdio.h>
>- #include <stdlib.h>
>-@@ -457,6 +455,9 @@
>- 		    hasErrors = 1;
>- 		}
>- 	    }
>-+
>-+	    message(MESS_DEBUG, "sleep 10 to wait daemon close log\n");
>-+	    sleep(10);
>- 
>- 	    if (!hasErrors && !log->rotateCount) {
>- 		message(MESS_DEBUG, "removing rotated log (rotateCount == 0)");
>diff -urN logrotate.orig/files/patch-logrotate.c logrotate/files/patch-logrotate.c
>--- logrotate.orig/files/patch-logrotate.c	Thu Jan  1 01:00:00 1970
>+++ logrotate/files/patch-logrotate.c	Fri Jul 18 13:20:50 2003
>@@ -0,0 +1,43 @@
>+--- logrotate.c.orig	Fri Aug  4 20:27:38 2000
>++++ logrotate.c	Fri Jul 18 15:20:13 2003
>+@@ -1,9 +1,7 @@
>+-#include <alloca.h>
>+ #include <ctype.h>
>+ #include <dirent.h>
>+ #include <errno.h>
>+ #include <fcntl.h>
>+-#include <getopt.h>
>+ #include <popt.h>
>+ #include <stdio.h>
>+ #include <stdlib.h>
>+@@ -395,8 +393,7 @@
>+ 	    if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
>+ 		message(MESS_DEBUG, "running prerotate script\n");
>+ 		if (runScript(log->files[logNum], log->pre)) {
>+-		    fprintf(errorFile, "error running prerotate script -- 
>+-				leaving old log in place\n");
>++		    fprintf(errorFile, "error running prerotate script -- leaving old log in place\n"); 
>+ 		    hasErrors = 1;
>+ 		}
>+ 	    }
>+@@ -471,6 +468,9 @@
>+ 		}
>+ 	    }
>+ 
>++	    message(MESS_DEBUG, "sleep 10 to wait daemon close log\n");
>++	    sleep(10);
>++
>+ 	    if (!hasErrors && !log->rotateCount) {
>+ 		message(MESS_DEBUG, "removing rotated log (rotateCount == 0)");
>+ 		if (unlink(finalName)) {
>+@@ -634,8 +634,8 @@
>+     if (log->pre && (log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
>+ 	message(MESS_DEBUG, "running shared prerotate script\n");
>+ 	if (runScript(log->pattern, log->pre)) {
>+-	    fprintf(errorFile, "error running shared prerotate script for %s-- 
>+-			leaving old logs in place\n", log->pattern);
>++	    fprintf(errorFile, "error running shared prerotate script for %s-- "
>++		"leaving old logs in place\n", log->pattern);
>+ 	    hasErrors = 1;
>+ 	}
>+     }

Actions: View | Diff

Attachments on bug 54613: 33298