INN commit: trunk (scripts/news.daily.in storage/expire.c)

[INN Commit]

    Date: Sunday, August 26, 2007 @ 01:16:59
  Author: iulius
Revision: 7657

More consistent output from expiry programs, as said in newslog(5):
no indentation before "/program/ start" and "/program/ end" but
four spaces before the output from run programs.

Modified:
  trunk/scripts/news.daily.in
  trunk/storage/expire.c

-----------------------+
 scripts/news.daily.in |   25 +++++++++++++------------
 storage/expire.c      |    6 +++---
 2 files changed, 16 insertions(+), 15 deletions(-)

Modified: scripts/news.daily.in
===================================================================
--- scripts/news.daily.in	2007-08-26 08:10:49 UTC (rev 7656)
+++ scripts/news.daily.in	2007-08-26 08:16:59 UTC (rev 7657)
@@ -251,7 +251,8 @@
 	echo "${EXPIREOVER} start `date`: (${EXPIREOVERFLAGS})" >>${EXPLOG}
     fi
     ( cd ${HISTDIR} ; exec 2>&1 ; eval ${EXPIREOVER} "${EXPIREOVERFLAGS}" ) \
-        >>${EXPLOG}
+        | ${SED} -e '/No such file or directory/d' \
+                 -e 's/^/    /' >>${EXPLOG}
     if ${DOEXPLOG}; then
 	echo "${EXPIREOVER} end `date`" >>${EXPLOG}
     fi
@@ -268,11 +269,11 @@
 	test -n "${TMPDIR}" && SORT="${SORT} -T ${TMPDIR}"	
 	${SORT} -u -o ${RMFILE} ${RMFILE}
 	if ${DOEXPLOG}; then
-	    echo "	expirerm start `date`" >>${EXPLOG}
+	    echo "expirerm start `date`" >>${EXPLOG}
 	fi
 	expirerm ${RMFILE}
 	if ${DOEXPLOG}; then
-	    echo "	expirerm end `date`" >>${EXPLOG}
+	    echo "expirerm end `date`" >>${EXPLOG}
 	fi
     }
     DOEXPIREOVER=false
@@ -379,7 +380,7 @@
 	}
     fi
     if ${DOEXPLOG}; then
-	echo "	all done `date`" >>${EXPLOG}
+	echo "all done `date`" >>${EXPLOG}
     fi
 fi
 
@@ -411,21 +412,21 @@
 	test -n "${TMPDIR}" && SORT="${SORT} -T ${TMPDIR}"	
 	${SORT} -u -o ${RMFILE} ${RMFILE}
 	if ${DOEXPLOG}; then
-	    echo "	expirerm start `date`" >>${EXPLOG}
+	    echo "expirerm start `date`" >>${EXPLOG}
 	fi
 	expirerm ${RMFILE}
 	if ${DOEXPLOG}; then
-	    echo "	expirerm end `date`" >>${EXPLOG}
+	    echo "expirerm end `date`" >>${EXPLOG}
 	fi
 	${DOEXPIREOVER} && {
 	    if ${DOEXPLOG}; then
-		echo "	${EXPIREOVER} start `date`" >>${EXPLOG}
+		echo "${EXPIREOVER} start `date`" >>${EXPLOG}
 	    fi
 	    ( cd ${HISTDIR} ; eval ${EXPIREOVER} "${EXPIREOVERFLAGS}" 2>&1 ) | \
 	      grep -v 'No such file or directory'
 	    DOEXPIREOVER=false
 	    if ${DOEXPLOG}; then
-		echo "	${EXPIREOVER} end `date`" >>${EXPLOG}
+		echo "${EXPIREOVER} end `date`" >>${EXPLOG}
 	    fi
 	}
 	test -n "${LOWMARKFILE}" && {
@@ -439,13 +440,13 @@
     # expire overview lines for files we just removed
     if ${DOEXPIREOVER}; then
 	if ${DOEXPLOG}; then
-	    echo "	${EXPIREOVER} start `date`" >>${EXPLOG}
+	    echo "${EXPIREOVER} start `date`" >>${EXPLOG}
 	fi
 	( cd ${HISTDIR} ; eval ${EXPIREOVER} "${EXPIREOVERFLAGS}" 2>&1 ) | \
 	    grep -v 'No such file or directory'
 	DOEXPIREOVER=false
 	if ${DOEXPLOG}; then
-	    echo "	${EXPIREOVER} end `date`" >>${EXPLOG}
+	    echo "${EXPIREOVER} end `date`" >>${EXPLOG}
 	fi
 	test -n "${LOWMARKFILE}" && {
 	    echo "lowmarkrenumber begin `date`: (${LOWMARKFILE})"   >>${EXPLOG}
@@ -459,12 +460,12 @@
 # in case noexpire expireover
 if ${DOEXPIREOVER}; then
     if ${DOEXPLOG}; then
-	echo "	${EXPIREOVER} start `date`" >>${EXPLOG}
+	echo "${EXPIREOVER} start `date`" >>${EXPLOG}
     fi
     ( cd ${HISTDIR} ; eval ${EXPIREOVER} "${EXPIREOVERFLAGS}" 2>&1 ) | \
 	grep -v 'No such file or directory'
     if ${DOEXPLOG}; then
-	echo "	${EXPIREOVER} end `date`" >>${EXPLOG}
+	echo "${EXPIREOVER} end `date`" >>${EXPLOG}
     fi
     test -n "${LOWMARKFILE}" && {
 	echo "lowmarkrenumber begin `date`: (${LOWMARKFILE})"   >>${EXPLOG}

Modified: storage/expire.c
===================================================================
--- storage/expire.c	2007-08-26 08:10:49 UTC (rev 7656)
+++ storage/expire.c	2007-08-26 08:16:59 UTC (rev 7657)
@@ -870,9 +870,9 @@
 
     if (EXPprocessed != 0) {
         if (!OVquiet) {
-            printf("    Article lines processed %8ld\n", EXPprocessed);
-            printf("    Articles dropped        %8ld\n", EXPunlinked);
-            printf("    Overview index dropped  %8ld\n", EXPoverindexdrop);
+            printf("Article lines processed %8ld\n", EXPprocessed);
+            printf("Articles dropped        %8ld\n", EXPunlinked);
+            printf("Overview index dropped  %8ld\n", EXPoverindexdrop);
         }
         EXPprocessed = EXPunlinked = EXPoverindexdrop = 0;
     }