log: make log severities cumulative

2 files changed, 23 insertions, 35 deletions

diff --git a/samples/knot.full.conf b/samples/knot.full.conf
index 1dedc33eb..52c408e8b 100644
--- a/samples/knot.full.conf
+++ b/samples/knot.full.conf
@@ -399,14 +399,13 @@ zones {
 #
 # Log messages are characterized by severity and category.
 # Supported severities:
-#   debug     - Debug messages. Must be turned on at compile time.
-#   info      - Informational messages.
-#   notice    - Notices and hints.
-#   warning   - Warnings. An action from the operator may be required.
-#   error     - Recoverable error. Some action should be taken.
+#   debug     - Debug messages and below. Must be turned on at compile time.
+#   info      - Informational messages and below.
+#   notice    - Notices and hints and below.
+#   warning   - Warnings and below. An action from the operator may be required.
+#   error     - Recoverable error and below. Some action should be taken.
 #   critical  - Non-recoverable errors resulting in server shutdown.
 #               (Not supported yet.)
-#   all       - All severities.
 #
 # Categories designate the source of the log message and roughly correspond
 #   to server modules
@@ -416,11 +415,6 @@ zones {
 #   answering - Messages regarding query processing and response creation.
 #   any       - All categories
 #
-# More severities (separated by commas) may be listed for each category.
-# All applicable severities must be listed.
-#   (I.e. specifying 'error' severity does mean: 'log error messages',
-#    and NOT 'log all messages of severity error and above'.)
-#
 # Default settings (in case there are no entries in 'log' section or the section
 # is missing at all):
 #
@@ -428,34 +422,32 @@ zones {
 # syslog { any error; }
 log {
 
-  # Log entry
-  #
   # Format 1:
   # <log> {
-  #   <category1> <severity1> [, <severity2> ...];
-  #   <category2> <severity1> [, <severity2> ...];
+  #   <category1> <severity1>;
+  #   <category2> <severity2>;
   #   ...
   # }
-  syslog {     # <log> is a symbolic name of a log device (see above)
-    # log errors of any category
-    any error;    # for <category> and <severity> see above
-    # log also warnings and notices from category 'zone'
-    zone warning, notice;
-    # log info from server
+
+  syslog {
+    # Log any error or critical to syslog
+    any error;
+    # Log all (excluding debug) from server to syslog
     server info;
   }
 
-  # Log fatal, warnings and errors to stderr
+  # Log any warning, error or critical to stderr
   stderr {
-    any error, warning;
+    any warning;
   }
 
   # Format 2:
-  # file <path> {
-  #   <category1> <severity1> [, <severity2> ...];
-  #   <category2> <severity1> [, <severity2> ...];
+  # file <path> { # <path> is absolute or relative path to log file
+  #   <category1> <severity1>;
+  #   <category2> <severity2>;
   # }
-  file "/tmp/knot-sample/knotd.debug" {  # <path> is absolute or relative path to log file
+
+  file "/tmp/knot-sample/knotd.debug" {
     server debug;
   }
 }
diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in
index 956e8a9b1..0fe02360a 100644
--- a/samples/knot.sample.conf.in
+++ b/samples/knot.sample.conf.in
@@ -79,16 +79,12 @@ zones {
 
 log {
   syslog {
-    # log errors of any category
-    any error;    # for <category> and <severity> see above
-    # log also warnings and notices from category 'zone'
-    zone warning, notice;
-    # log info from server
-    server info;
+    # Log info and more serious events to syslog
+    any info;
   }
 
-  # Log fatal, warnings and errors to stderr
+  # Log warnings, errors and criticals to stderr
   stderr {
-    any error, warning;
+    any warning;
   }
 }