INN commit: trunk (6 files)
INN Commit
Russ_Allbery at isc.org
Mon Sep 3 13:09:38 UTC 2007
Date: Monday, September 3, 2007 @ 06:09:38
Author: iulius
Revision: 7666
* Add three log files to scanlogs (controlbatch.log, perl-nocem.log
and send-ihave.log).
* Change syslog(2) to syslog(3).
* Use files from innshellvars ($inn::activetimes instead of
$inn:pathdb/active.times for instance).
Modified:
trunk/backends/mod-active.in
trunk/doc/pod/hook-perl.pod
trunk/doc/pod/newslog.pod
trunk/frontends/scanspool.in
trunk/scripts/inncheck.in
trunk/scripts/scanlogs.in
------------------------+
backends/mod-active.in | 2 +-
doc/pod/hook-perl.pod | 2 +-
doc/pod/newslog.pod | 16 ++++++++++++++++
frontends/scanspool.in | 2 +-
scripts/inncheck.in | 20 ++++++++++----------
scripts/scanlogs.in | 5 ++++-
6 files changed, 33 insertions(+), 14 deletions(-)
Modified: backends/mod-active.in
===================================================================
--- backends/mod-active.in 2007-09-03 09:17:40 UTC (rev 7665)
+++ backends/mod-active.in 2007-09-03 13:09:38 UTC (rev 7666)
@@ -11,7 +11,7 @@
$oldact = $inn::active; # active file location
$oldact = $inn::active; # active file location (same; shut up, perl -w)
$newact = "$oldact.new$$"; # temporary name for new active file
-$actime = "$oldact.times"; # active.times file
+$actime = $inn::activetimes; # active.times file
$pausemsg = 'batch active update, ok'; # message to be used for pausing?
$diff_flags = ''; # Flags for diff(1); default chosen if null.
Modified: doc/pod/hook-perl.pod
===================================================================
--- doc/pod/hook-perl.pod 2007-09-03 09:17:40 UTC (rev 7665)
+++ doc/pod/hook-perl.pod 2007-09-03 13:09:38 UTC (rev 7666)
@@ -260,7 +260,7 @@
=item INN::syslog(level, message)
-Logs a message via syslog(2). This is quite a bit more reliable and
+Logs a message via syslog(3). This is quite a bit more reliable and
portable than trying to use Sys::Syslog from inside the Perl filter. Only
the first character of the level argument matters; the valid letters are
the first letters of ALERT, CRIT, ERR, WARNING, NOTICE, INFO, and DEBUG
Modified: doc/pod/newslog.pod
===================================================================
--- doc/pod/newslog.pod 2007-09-03 09:17:40 UTC (rev 7665)
+++ doc/pod/newslog.pod 2007-09-03 13:09:38 UTC (rev 7666)
@@ -73,6 +73,11 @@
rmgroup verify-*=rmgroup PGP verify, remove group and log message.
checkgroups doit=checkgroups Process and log message.
+=item F<controlbatch.log>
+
+The B<controlbatch> program appends all status messages to this file. It is
+rotated by B<scanlogs>.
+
=item F<errlog>
This file contains the standard output and standard error of any program
@@ -184,6 +189,17 @@
The B<nntpsend> program appends all status messages to this file. It is
rotated by B<scanlogs>.
+=item F<perl-nocem.log>
+
+The B<perl-nocem> program appends all status messages to this file if
+Sys::Syslog is not used (otherwise, such messages are appended to
+F<news.notice>). It is rotated by B<scanlogs>.
+
+=item F<send-ihave.log>
+
+The B<send-ihave> program appends all status messages to this file. It is
+rotated by B<scanlogs>.
+
=item F<send-nntp.log>
The B<send-nntp> program appends all status messages to this file. It is
Modified: frontends/scanspool.in
===================================================================
--- frontends/scanspool.in 2007-09-03 09:17:40 UTC (rev 7665)
+++ frontends/scanspool.in 2007-09-03 13:09:38 UTC (rev 7666)
@@ -109,7 +109,7 @@
#
$prog = $0; # our name
$spool = "$inn::patharticles";
-$active = "$inn::pathdb/active";
+$active = "$inn::active";
$ctlinnd = "$inn::pathbin/ctlinnd";
$reason = "running scanspool"; # throttle reason
Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in 2007-09-03 09:17:40 UTC (rev 7665)
+++ scripts/inncheck.in 2007-09-03 13:09:38 UTC (rev 7666)
@@ -17,25 +17,25 @@
## We use simple names, mapping them to the real filenames only when
## we actually need a filename.
%paths = (
- 'active', "$inn::pathdb/active",
+ 'active', "$inn::active",
'archive', "$inn::patharchive",
- 'badnews', "$inn::pathincoming/bad",
+ 'badnews', "$inn::badnews",
'batchdir', "$inn::pathoutgoing",
- 'control.ctl', "$inn::pathetc/control.ctl",
+ 'control.ctl', "$inn::ctlfile",
'ctlprogs', "$inn::pathcontrol",
- 'expire.ctl', "$inn::pathetc/expire.ctl",
- 'history', "$inn::pathdb/history",
+ 'expire.ctl', "$inn::expirectl",
+ 'history', "$inn::history",
'incoming.conf', "$inn::pathetc/incoming.conf",
- 'inews', "$inn::pathbin/inews",
+ 'inews', "$inn::inews",
'inn.conf', "$inn::pathetc/inn.conf",
'innbind', "$inn::pathbin/innbind",
- 'innd', "$inn::pathbin/innd",
+ 'innd', "$inn::innd",
'innddir', "$inn::pathrun",
'moderators', "$inn::pathetc/moderators",
'most_logs', "$inn::pathlog",
'newsbin', "$inn::pathbin",
'newsboot', "$inn::pathbin/rc.news",
- 'newsfeeds', "$inn::pathetc/newsfeeds",
+ 'newsfeeds', "$inn::newsfeeds",
'overview.fmt', "$inn::pathetc/overview.fmt",
'newsetc', "$inn::pathetc",
'newslib', "@libdir@",
@@ -44,7 +44,7 @@
'oldlogs', "$inn::pathlog/OLD",
'passwd.nntp', "$inn::pathetc/passwd.nntp",
'readers.conf', "$inn::pathetc/readers.conf",
- 'rnews', "$inn::pathbin/rnews",
+ 'rnews', "$inn::rnews",
'rnewsprogs', "$inn::pathbin/rnews.libexec",
'spooltemp', "$inn::pathtmp",
'spool', "$inn::patharticles",
@@ -280,7 +280,7 @@
sub
inn_conf
{
- system ("$inn::pathbin/innconfval", '-C');
+ system ("$inn::innconfval", '-C');
# if ( $k eq "domain" ) {
# print "$file:$line: domain (`$v') isn't local domain\n"
Modified: scripts/scanlogs.in
===================================================================
--- scripts/scanlogs.in 2007-09-03 09:17:40 UTC (rev 7665)
+++ scripts/scanlogs.in 2007-09-03 13:09:38 UTC (rev 7666)
@@ -21,6 +21,7 @@
## Where these programs, if used, write their logs.
## We also have to find innfeed's log file.
+CONTROLBATCH=${MOST_LOGS}/controlbatch.log
INNFEEDLOG=`${AWK} '{gsub(/:|#/, " & ")} {if ($1 == "log-file" && $2 == ":") print $3}' ${PATHETC}/innfeed.conf`
INNFEED=
for F in "${INNFEEDLOG}" ; do
@@ -28,9 +29,11 @@
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="${INNFEED} ${NNTPSEND} ${SENDNNTP} ${SENDUUCP}"
+LIVEFILES="${CONTROLBATCH} ${INNFEED} ${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