INN commit: trunk/scripts (scanlogs.in)

INN Commit rra at isc.org
Sun Dec 23 19:20:47 UTC 2012


    Date: Sunday, December 23, 2012 @ 11:20:47
  Author: eagle
Revision: 9449

Do not attempt to rotate innfeed logs

innfeed with funnel feeds will hold its log files open forever,
so those log files cannot be safely rotated with scanlogs.  There's
no way to signal innfeed to close the log file and open a new one.
Remove the code in scanlogs that attempts to deal with them.

Patch from Florian Schlichting <fschlich at CIS.FU-Berlin.DE>.

Modified:
  trunk/scripts/scanlogs.in

-------------+
 scanlogs.in |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Modified: scanlogs.in
===================================================================
--- scanlogs.in	2012-12-07 19:01:58 UTC (rev 9448)
+++ scanlogs.in	2012-12-23 19:20:47 UTC (rev 9449)
@@ -22,21 +22,12 @@
 ##  Where these programs, if used, write their logs.
 ##  We also have to find innfeed's log file.
 CONTROLBATCH=${MOST_LOGS}/controlbatch.log
-INNFEEDCONF=${PATHETC}/innfeed.conf
-if [ -f "${INNFEEDCONF}" ]; then
-    INNFEEDLOG=`${AWK} '{gsub(/:|#/, " & ")} {if ($1 == "log-file" && $2 == ":") print $3}' ${INNFEEDCONF}`
-fi
-INNFEED=
-for F in "${INNFEEDLOG}" ; do
-    test -f "${MOST_LOGS}/${F}" && INNFEED="${INNFEED} ${MOST_LOGS}/${F}"
-done
-test -z "${INNFEED}" && test -f "${MOST_LOGS}/innfeed.log" && INNFEED="${MOST_LOGS}/innfeed.log"
 NNTPSEND=${MOST_LOGS}/nntpsend.log
 PERLNOCEM=${MOST_LOGS}/perl-nocem.log
 SENDIHAVE=${MOST_LOGS}/send-ihave.log
 SENDNNTP=${MOST_LOGS}/send-nntp.log
 SENDUUCP=${MOST_LOGS}/send-uucp.log
-LIVEFILES="${CONTROLBATCH} ${INNFEED} ${NNTPSEND} ${PERLNOCEM} ${SENDIHAVE} ${SENDNNTP} ${SENDUUCP}"
+LIVEFILES="${CONTROLBATCH} ${NNTPSEND} ${PERLNOCEM} ${SENDIHAVE} ${SENDNNTP} ${SENDUUCP}"
 
 ##  Where news.daily places expire output, unless noexplog was used.
 EXPLOG=${MOST_LOGS}/expire.log



More information about the inn-committers mailing list