rpc: remove remains of obsolete log_buffer_size config parameter

The global log buffer feature was deleted in:

  commit c0c8c1d7bb53e0420f8573ea961ef7e19b7fff85
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Mon Mar 3 14:54:33 2014 +0000

    Remove global log buffer feature entirely

    A earlier commit changed the global log buffer so that it only
    records messages that are explicitly requested via the log
    filters setting. This removes the performance burden, and
    improves the signal/noise ratio for messages in the global
    buffer. At the same time though, it is somewhat pointless, since
    all the recorded log messages are already going to be sent to an
    explicit log output like syslog, stderr or the journal. The
    global log buffer is thus just duplicating this data on stderr
    upon crash.

    The log_buffer_size config parameter is left in the augeas
    lens to prevent breakage for users on upgrade. It is however
    completely ignored hereafter.

    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This was in the 1.2.3 release, and 4 years is sufficient time for a
graceful upgrade path for augeas, so all remaining traces are now
removed.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd.aug.in
index 1d0cdbeeb2056db6212e5b62cd6c39e4255a1930..35095b403c35f3f01fa26009d13209a1c210ee2a 100644 (file)
--- a/src/locking/test_virtlockd.aug.in
+++ b/src/locking/test_virtlockd.aug.in
@@ -2,7 +2,6 @@ module Test_virtlockd =
   let conf = "log_level = 3
 log_filters=\"3:remote 4:event\"
 log_outputs=\"3:syslog:libvirtd\"
-log_buffer_size = 64
 max_clients = 10
 admin_max_clients = 10
 "
@@ -11,6 +10,5 @@ admin_max_clients = 10
         { "log_level" = "3" }
         { "log_filters" = "3:remote 4:event" }
         { "log_outputs" = "3:syslog:libvirtd" }
-        { "log_buffer_size" = "64" }
         { "max_clients" = "10" }
         { "admin_max_clients" = "10" }

diff --git a/src/locking/virtlockd.aug b/src/locking/virtlockd.aug
index 7b152ed407d9cd26069643559c7f3c5f7174517a..06d508e6e5e43833bce6004c122754eb15a181b1 100644 (file)
--- a/src/locking/virtlockd.aug
+++ b/src/locking/virtlockd.aug
@@ -27,7 +27,6 @@ module Virtlockd =
    let logging_entry = int_entry "log_level"
                      | str_entry "log_filters"
                      | str_entry "log_outputs"
-                     | int_entry "log_buffer_size"
                      | int_entry "max_clients"
                      | int_entry "admin_max_clients"
 

diff --git a/src/locking/virtlockd.conf b/src/locking/virtlockd.conf
index 24b69aa4253ce49f3aabd114d41975ecd6eed636..1b897973443b91c398726dd7e4112ad5459c51b5 100644 (file)
--- a/src/locking/virtlockd.conf
+++ b/src/locking/virtlockd.conf
@@ -52,13 +52,6 @@
 #log_outputs="3:syslog:virtlockd"
 #
 
-# Log debug buffer size:
-#
-# This configuration option is no longer used, since the global
-# log buffer functionality has been removed. Please configure
-# suitable log_outputs/log_filters settings to obtain logs.
-#log_buffer_size = 64
-
 # The maximum number of concurrent client connections to allow
 # over all sockets combined.
 # Each running virtual machine will require one open connection

diff --git a/src/logging/virtlogd.aug b/src/logging/virtlogd.aug
index 4fdcba72af5b493c133410690e3b1d4a5e5ae439..04580734d6590e20b12cc06564d3701ec5100c41 100644 (file)
--- a/src/logging/virtlogd.aug
+++ b/src/logging/virtlogd.aug
@@ -27,7 +27,6 @@ module Virtlogd =
    let logging_entry = int_entry "log_level"
                      | str_entry "log_filters"
                      | str_entry "log_outputs"
-                     | int_entry "log_buffer_size"
                      | int_entry "max_clients"
                      | int_entry "admin_max_clients"
                      | int_entry "max_size"

diff --git a/src/remote/libvirtd.aug b/src/remote/libvirtd.aug
index df310d8763d55521899d0b9371a6c17bfe306a89..13333448a45f18410429f77b05333256e7a62264 100644 (file)
--- a/src/remote/libvirtd.aug
+++ b/src/remote/libvirtd.aug
@@ -72,7 +72,6 @@ module Libvirtd =
    let logging_entry = int_entry "log_level"
                      | str_entry "log_filters"
                      | str_entry "log_outputs"
-                     | int_entry "log_buffer_size"
 
    let auditing_entry = int_entry "audit_level"
                       | bool_entry "audit_logging"

diff --git a/src/remote/libvirtd.conf b/src/remote/libvirtd.conf
index 91b3f47deccfd7da294c5355f7b0f1793700e6c0..4aed7e74691628ae961eb3fd77b3683a2420f76e 100644 (file)
--- a/src/remote/libvirtd.conf
+++ b/src/remote/libvirtd.conf
@@ -394,13 +394,6 @@
 #log_outputs="3:syslog:libvirtd"
 #
 
-# Log debug buffer size:
-#
-# This configuration option is no longer used, since the global
-# log buffer functionality has been removed. Please configure
-# suitable log_outputs/log_filters settings to obtain logs.
-#log_buffer_size = 64
-
 
 ##################################################################
 #

diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in
index b24b32e33db78c870002fead5b2191540de0c997..2bd7ec1bd687bcdd64c8e969362b1f439527cda9 100644 (file)
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -51,7 +51,6 @@ module Test_libvirtd =
         { "log_level" = "3" }
         { "log_filters" = "3:remote 4:event" }
         { "log_outputs" = "3:syslog:libvirtd" }
-        { "log_buffer_size" = "64" }
         { "audit_level" = "2" }
         { "audit_logging" = "1" }
         { "host_uuid" = "00000000-0000-0000-0000-000000000000" }