Log Message:
-----------
Revisions to documentation and altperl code to clarify the 9 levels
of logging and their use.

As suggested by Mark Stosberg.

Modified Files:
--------------
    slony1-engine/doc/adminguide:
        loganalysis.sgml (r1.5 -> r1.6)
        slon.sgml (r1.29 -> r1.30)
        slonconf.sgml (r1.14 -> r1.15)
    slony1-engine/src/slon:
        confoptions.c (r1.19 -> r1.20)
    slony1-engine/tools/altperl:
        slon-tools.pm (r1.28 -> r1.29)
        slon_tools.conf-sample (r1.7 -> r1.8)

-------------- next part --------------
Index: slonconf.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonconf.sgml,v
retrieving revision 1.14
retrieving revision 1.15
diff -Ldoc/adminguide/slonconf.sgml -Ldoc/adminguide/slonconf.sgml -u -w -r1.14 -r1.15
--- doc/adminguide/slonconf.sgml
+++ doc/adminguide/slonconf.sgml
@@ -86,7 +86,13 @@
         <primary><varname>log_level</varname> configuration parameter</primary>
       </indexterm>
       <listitem>
-        <para>Debug log level (higher value ==> more output).  Range: [0,4], default 4</para>
+        <para>Debug log level (higher value ==> more output).  Range: [0,4], default 2</para>
+
+	<para> There are <link linkend="nineloglevels">nine log
+	message types</link>; using this option, some or all of
+	the <quote>debugging</quote> levels may be left out of the
+	slon logs. </para>
+
       </listitem>
     </varlistentry>
 
Index: slon.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slon.sgml,v
retrieving revision 1.29
retrieving revision 1.30
diff -Ldoc/adminguide/slon.sgml -Ldoc/adminguide/slon.sgml -u -w -r1.29 -r1.30
--- doc/adminguide/slon.sgml
+++ doc/adminguide/slon.sgml
@@ -40,16 +40,17 @@
   
   <variablelist>
    <varlistentry>
-    <term><option>-d</option><replaceable class="parameter"> debuglevel</replaceable></term>
+    <term><option>-d</option><replaceable class="parameter"> log_level</replaceable></term>
     <listitem>
      <para>
-      The <envar>log_level</envar> specifies which Debug levels
+      The <envar>log_level</envar> specifies which levels of debugging messages
       <application>slon</application> should display when logging its
       activity.
      </para>
-     <para>
-      The eight levels of logging are:
+     <para id="nineloglevels">
+      The nine levels of logging are:
       <itemizedlist>
+       <listitem><para>Fatal</para></listitem>
        <listitem><para>Error</para></listitem>
        <listitem><para>Warn</para></listitem>
        <listitem><para>Config</para></listitem>
@@ -60,11 +61,13 @@
        <listitem><para>Debug4</para></listitem>
       </itemizedlist>
      </para>
-     <para> Thus, <emphasis>all</emphasis> the non-debugging log
-     levels are always displayed in the logs.  If
-     <envar>log_level</envar> is set to 2 (a routine, and, seemingly
+
+     <para> The first five non-debugging log levels (from Fatal to
+     Info) are <emphasis>always</emphasis> displayed in the logs.  If
+     <envar>log_level</envar> is set to 2 (a routine, and, seemingly,
      preferable choice), then output at debugging levels 1 and 2 will
      also be displayed.</para>
+
     </listitem>
    </varlistentry>
    
Index: loganalysis.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/loganalysis.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ldoc/adminguide/loganalysis.sgml -Ldoc/adminguide/loganalysis.sgml -u -w -r1.5 -r1.6
--- doc/adminguide/loganalysis.sgml
+++ doc/adminguide/loganalysis.sgml
@@ -58,6 +58,12 @@
 
 </variablelist>
 </para>
+
+<para> How much information they display is controlled by
+the <envar>log_level</envar> &lslon; parameter;
+ERROR/WARN/CONFIG/INFO messages will always be displayed, while
+choosing increasing values from 1 to 4 will lead to additional DEBUG
+level messages being displayed. </para>
 </sect2>
 
 <sect2> <title> How to read &slony1; logs </title>
Index: confoptions.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/slon/confoptions.c -Lsrc/slon/confoptions.c -u -w -r1.19 -r1.20
--- src/slon/confoptions.c
+++ src/slon/confoptions.c
@@ -556,7 +556,7 @@
 			SLON_C_INT
 		},
 		&slon_log_level,
-		4,
+		2,
 		0,
 		4
 	},
Index: slon-tools.pm
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon-tools.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -Ltools/altperl/slon-tools.pm -Ltools/altperl/slon-tools.pm -u -w -r1.28 -r1.29
--- tools/altperl/slon-tools.pm
+++ tools/altperl/slon-tools.pm
@@ -133,7 +133,7 @@
   my ($dsn, $dbname) = ($DSN[$nodenum], $DBNAME[$nodenum]);
   $SYNC_CHECK_INTERVAL ||= 1000;
   system("mkdir -p $LOGDIR/slony1/node$nodenum");
-  my $cmd = "@@SLONBINDIR@@/slon -s $SYNC_CHECK_INTERVAL -d2 $CLUSTER_NAME '$dsn' 2>&1 ";
+  my $cmd = "@@SLONBINDIR@@/slon -s $SYNC_CHECK_INTERVAL -d$DEBUGLEVEL $CLUSTER_NAME '$dsn' 2>&1 ";
   if ($APACHE_ROTATOR) {
     $cmd .= "| $APACHE_ROTATOR \"$LOGDIR/slony1/node$nodenum/" .  $dbname . "_%Y-%m-%d_%H:%M:%S.log\" 10M &";
   } else {
Index: slon_tools.conf-sample
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_tools.conf-sample,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ltools/altperl/slon_tools.conf-sample -Ltools/altperl/slon_tools.conf-sample -u -w -r1.7 -r1.8
--- tools/altperl/slon_tools.conf-sample
+++ tools/altperl/slon_tools.conf-sample
@@ -37,6 +37,9 @@
     # Which node is the default master for all sets?
     $MASTERNODE = 1;
 
+    # Which debugging level to use?  [0-4]
+    $DEBUGLEVEL = 2;
+
     # Include add_node lines for each node in the cluster.  Be sure to
     # use host names that will resolve properly on all nodes
     # (i.e. only use 'localhost' if all nodes are on the same host).