close to 0.9.5 - multiple instances are supported now

4 files changed, 34 insertions, 18 deletions

diff --git a/BUGS b/BUGS
index ce3c27e4..00890c43 100644
--- a/BUGS
+++ b/BUGS
@@ -11,13 +11,8 @@ ERRORS ON STARTUP
    errors correctly, but sometimes a message is only reported if
    running in debug mode. If you experience some strange behaviour
    I suggest to run the syslogd interactively with debugging enabled.
-
-VERY LARGE LOG FILES
-   We have done nothing to support log files larger than 2GB. As such, it
-   behaves just like sysklogd in this regard. And, as far as I recall, this
-   means that - at least with certain glibc versions - no more than 2GB
-   will be written. This will be checked and supported at a later time, for
-   now just be careful ;).
+   As of August, 2005, the situation has much improved. Keep in mind,
+   thought, that debug mode is your friend ;)
 
 EQUALLY-NAMED TEMPLATES
    If multiple templates with the SAME name are created, all but the
@@ -34,12 +29,6 @@ WALLMSG FORMAT (* selector)
    date is missing. Will be fixed soon and can also be fixed just via
    the proper template. Anyone up for this? ;)
 
-BUILDING WITH MYSQL
-   The MySQL code is activated by defining -DWITH_DB in the CFLAGS.
-   Depending on your system, you may need to change some library locations
-   and such. Building with MySQL is currently not as straightforward
-   as it should be ;)
-
 CALLS to exit()
    I have removed all calls to exit() I have introduced. However, there are
    still some left from the original code. Most of them are OK, being done
@@ -54,6 +43,12 @@ SIGPIPE HANDLING
   connections. We should further look into this issue and see which other
   ways exist to handle the situation.
 
+MULTIPLE INSTANCES
+  If multiple instances are running on a single machine, the one with
+  the -r switch must start first. Also, UDP-based syslog forwarding 
+  between the instances does not work. Use TCP instead.
+  2005-08-01
+
 Updates to the bug lists (and potential fixes...) can be found at the 
 official home page at
 
diff --git a/NEWS b/NEWS
index ad606959..f84ff219 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 0.9.5 (RGer), around 2005-07-28
+Version 0.9.5 (RGer), around 2005-08-01
 - the "semicolon bug" was actually not (fully) solved in 0.9.4. One
   part of the bug was solved, but another still existed. This one
   is fixed now, too.
@@ -12,10 +12,14 @@ Version 0.9.5 (RGer), around 2005-07-28
 - improved error reporting for template errors on startup. They are now
   shown on the console and the start-up tty. Formerly, they were only
   visible in debug mode.
+- support for multiple instances of rsyslogd on a single machine added
 - added new option "-o" --> omit local unix domain socket. This option
   enables rsyslogd NOT to listen to the local socket. This is most
   helpful when multiple instances of rsyslogd (or rsyslogd and another
   syslogd) shall run on a single system.
+- added new option "-i <pidfile>" which allows to specify the pidfile.
+  This is needed when multiple instances of rsyslogd are to be run.
+- the new project home page is now online at www.rsyslog.com
 ---------------------------------------------------------------------------
 Version 0.9.4 (RGer), 2005-07-25
 - finally added the TCP sender. It now supports non-blocking mode, no
diff --git a/rsyslogd.8 b/rsyslogd.8
index c509c8fa..61ea7925 100644
--- a/rsyslogd.8
+++ b/rsyslogd.8
@@ -1,7 +1,7 @@
 .\" Copyright 2004-2005 Rainer Gerhards and Adiscon for the rsyslog modifications
 .\" May be distributed under the GNU General Public License
 .\"
-.TH RSYSLOGD 8 "25 July 2005" "Version 0.9.4" "Linux System Administration"
+.TH RSYSLOGD 8 "01 August 2005" "Version 0.9.5" "Linux System Administration"
 .SH NAME
 rsyslogd \- reliable and extended syslogd 
 .SH SYNOPSIS
@@ -14,6 +14,9 @@ rsyslogd \- reliable and extended syslogd
 .I config file
 ]
 .RB [ " \-h " ] 
+.RB [ " \-i "
+.I pid file
+]
 .RB [ " \-l "
 .I hostlist
 ]
@@ -21,14 +24,15 @@ rsyslogd \- reliable and extended syslogd
 .I interval
 ] 
 .RB [ " \-n " ]
+.RB [ " \-o " ]
 .RB [ " \-p"
 .IB socket 
 ]
 .RB [ " \-r " ]
+.br
 .RB [ " \-s "
 .I domainlist
 ]
-.br
 .RB [ " \-t "
 .I port
 ]
@@ -115,6 +119,11 @@ Specifying this switch on the command line will cause the log daemon to
 forward any remote messages it receives to forwarding hosts which have been
 defined.
 .TP
+.BI "\-i " "pid file"
+Specify an alternative pid file instead of the default one.
+This option must be used if multiple instances of rsyslogd should
+run on a single machine.
+.TP
 .BI "\-l " "hostlist"
 Specify a hostname that should be logged only with its simple hostname
 and not the fqdn.  Multiple hosts may be specified using the colon
@@ -142,6 +151,11 @@ Avoid auto-backgrounding.  This is needed especially if the
 is started and controlled by
 .BR init (8).
 .TP
+.B "\-o"
+Omit reading the standard local log socket. This option is most
+useful for running multiple instances of rsyslogd on a single 
+machine. When specified, no local log socket is opened at all.
+.TP
 .BI "\-p " "socket"
 You can specify an alternative unix domain socket instead of
 .IR /dev/log "."
diff --git a/syslogd.c b/syslogd.c
index 7b9bc857..3c16ce16 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2412,8 +2412,11 @@ int main(argc, argv)
 	if ( Debug )
 	{
 		dprintf("Debugging disabled, SIGUSR1 to turn on debugging.\n");
-		/* DEBUG-AID/RELEASE: comment out line below if you need that */
-		debugging_on = 1;
+		/* DEBUG-AID/RELEASE: value 0 below should be used for
+		 * release. Value 1 might be used if you would like to keep debug
+		 * mode enabled during testing. 
+		 */
+		debugging_on = 0;
 	}
 	/*
 	 * Send a signal to the parent to it can terminate.