INN commit: trunk (innfeed/host.c samples/innfeed.conf)
INN Commit
Russ_Allbery at isc.org
Sun Aug 26 08:10:49 UTC 2007
Date: Sunday, August 26, 2007 @ 01:10:49
Author: iulius
Revision: 7656
If gen-html is true in innfeed.conf, write the status file
in pathhttp (otherwise, write it in the pathlog directory, the
previous default behaviour). It is indeed more consistent with
innd status file written in HTML in pathhttp.
Modified:
trunk/innfeed/host.c
trunk/samples/innfeed.conf
----------------------+
innfeed/host.c | 10 +++++++---
samples/innfeed.conf | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
Modified: innfeed/host.c
===================================================================
--- innfeed/host.c 2007-08-23 11:33:14 UTC (rev 7655)
+++ innfeed/host.c 2007-08-26 08:10:49 UTC (rev 7656)
@@ -2479,12 +2479,16 @@
if (filename == NULL)
die ("Can't set status file name with a NULL filename\n") ;
else if (*filename == '\0')
- die ("Can't set status file name with a empty string\n") ;
+ die ("Can't set status file name with an empty string\n") ;
if (*filename == '/')
statusFile = xstrdup (filename) ;
- else
- statusFile = concatpath (innconf->pathlog,filename) ;
+ else {
+ if (genHtml)
+ statusFile = concatpath (innconf->pathhttp,filename) ;
+ else
+ statusFile = concatpath (innconf->pathlog,filename) ;
+ }
if ((fp = fopen (statusFile,"w")) == NULL)
{
Modified: samples/innfeed.conf
===================================================================
--- samples/innfeed.conf 2007-08-23 11:33:14 UTC (rev 7655)
+++ samples/innfeed.conf 2007-08-26 08:10:49 UTC (rev 7656)
@@ -29,8 +29,8 @@
dns-retry: 900
dns-expire: 86400
close-period: 86400
-gen-html: false
-status-file: innfeed.status # relative to pathlog
+gen-html: false # if true, status-file is relative to pathhttp
+status-file: innfeed.status # otherwise, it is relative to pathlog
connection-stats: false
host-queue-highwater: 200
stats-period: 600
More information about the inn-committers
mailing list