From 970c143497d6207e6975c61b8b4306d02cdcc873 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Mon, 22 Dec 2008 12:57:35 +0000
Subject: [PATCH] Document the new daemon options * qemud/libvirtd.aug
 qemud/libvirtd.conf: document the new   options in the config file and
 augment the Augeas description daniel

---
 ChangeLog           |  5 +++++
 qemud/libvirtd.aug  |  5 +++++
 qemud/libvirtd.conf | 49 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0680501adb..cbca827dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 22 13:56:13 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+	* qemud/libvirtd.aug qemud/libvirtd.conf: document the new
+	  options in the config file and augment the Augeas description
+
 Mon Dec 22 13:54:30 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* qemud/event.c qemud/mdns.c qemud/remote.c: switch other pieces
diff --git a/qemud/libvirtd.aug b/qemud/libvirtd.aug
index fdb25072ac..7cfd458efb 100644
--- a/qemud/libvirtd.aug
+++ b/qemud/libvirtd.aug
@@ -54,6 +54,10 @@ module Libvirtd =
                         | int_entry "max_workers"
                         | int_entry "max_clients"
 
+   let logging_entry = int_entry "log_level"
+                     | str_entry "log_filters"
+                     | str_entry "log_outputs"
+
    (* Each enty in the config is one of the following three ... *)
    let entry = network_entry
              | sock_acl_entry
@@ -61,6 +65,7 @@ module Libvirtd =
              | certificate_entry
              | authorization_entry
              | processing_entry
+             | logging_entry
    let comment = [ label "#comment" . del /#[ \t]*/ "# " .  store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
    let empty = [ label "#empty" . eol ]
 
diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf
index cd82e8bc4d..ecb28dcdf3 100644
--- a/qemud/libvirtd.conf
+++ b/qemud/libvirtd.conf
@@ -247,3 +247,52 @@
 #min_workers = 5
 #max_workers = 20
 
+#################################################################
+#
+# Logging controls
+#
+
+# Logging level: 0 none, 4 errors, 3 warnings, 2 informations, 1 debug
+# basically 1 will log everything possible
+#log_level = 3
+
+# Logging filters:
+# A filter allows to select a different logging level for a given category
+# of logs
+# The format for a filter is:
+#    x:name
+#      where name is a match string e.g. remote or qemu
+# the x prefix is the minimal level where matching messages should be logged
+#    1: DEBUG
+#    2: INFO
+#    3: WARNING
+#    4: ERROR
+#
+# Multiple filter can be defined in a single @filters, they just need to be
+# separated by spaces.
+#
+# e.g:
+# log_filters="3:remote 4:event"
+# to only get warning or errors from the remote layer and only errors from
+# the event layer.
+
+# Logging outputs:
+# An output is one of the places to save logging informations
+# The format for an output can be:
+#    x:stderr
+#      output goes to stderr
+#    x:syslog:name
+#      use syslog for the output and use the given name as the ident
+#    x:file:file_path
+#      output to a file, with the given filepath
+# In all case the x prefix is the minimal level, acting as a filter
+#    0: everything
+#    1: DEBUG
+#    2: INFO
+#    3: WARNING
+#    4: ERROR
+#
+# Multiple output can be defined , they just need to be separated by spaces.
+# e.g.:
+# log_outputs="3:syslog:libvirtd"
+# to log all warnings and errors to syslog under the libvirtd ident