[libvirt] [PATCH v2 16/20] daemon: Split filter parsing and filter defining

[Erik Skultety]

Similar to outputs, parser should do parsing only, thus the 'define' logic
is going to be stripped from virLogParseAndDefineFilters by replacing calls to
this method to virLogSetFilters instead.

Signed-off-by: Erik Skultety <eskul...@redhat.com>
---
 daemon/libvirtd.c         | 2 +-
 src/locking/lock_daemon.c | 2 +-
 src/logging/log_daemon.c  | 2 +-
 src/util/virlog.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 1251208..2eac827 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -691,7 +691,7 @@ daemonSetupLogging(struct daemonConfig *config,
     virLogSetFromEnv();
 
     if (virLogGetNbFilters() == 0)
-        virLogParseAndDefineFilters(config->log_filters);
+        virLogSetFilters(config->log_filters);
 
     if (virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 9e736af..9ee818e 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -476,7 +476,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config,
     virLogSetFromEnv();
 
     if (virLogGetNbFilters() == 0)
-        virLogParseAndDefineFilters(config->log_filters);
+        virLogSetFilters(config->log_filters);
 
     if (virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);
diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 08ad6e0..a9aebdb 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -404,7 +404,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config,
     virLogSetFromEnv();
 
     if (virLogGetNbFilters() == 0)
-        virLogParseAndDefineFilters(config->log_filters);
+        virLogSetFilters(config->log_filters);
 
     if (virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);
diff --git a/src/util/virlog.c b/src/util/virlog.c
index b336529..36c3a38 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1627,7 +1627,7 @@ virLogSetFromEnv(void)
         virLogParseDefaultPriority(debugEnv);
     debugEnv = virGetEnvAllowSUID("LIBVIRT_LOG_FILTERS");
     if (debugEnv && *debugEnv)
-        virLogParseAndDefineFilters(debugEnv);
+        virLogSetFilters(debugEnv);
     debugEnv = virGetEnvAllowSUID("LIBVIRT_LOG_OUTPUTS");
     if (debugEnv && *debugEnv)
         virLogSetOutputs(debugEnv);
-- 
2.5.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list