daemon: Split filter parsing and filter defining

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 <eskultet@redhat.com>

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index c482f278922a920c58039da934dc214d0e63c7a6..fbba9cc4e48717ce05ce4d47e3139dfadbb4e492 100644 (file)
--- 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 (config->log_outputs && virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 4856cd6fb440569989bf25240a16491786d52437..02745be65212f7ea224ce3c517130f249f4f5f0d 100644 (file)
--- 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 (config->log_outputs && virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 74dae5f67c9f5a5a73c5bb30487ed6adb6a4609c..04bb83616d1a84a35885c298aab4ebf00d47d404 100644 (file)
--- 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 (config->log_outputs && virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 9a247eefa11876091030e88df4637b620cbf0c75..24ef0763b0ebc559c35ee0e1609a96807b15fb40 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1624,7 +1624,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);

diff --git a/tests/virlogtest.c b/tests/virlogtest.c
index 9d657d09ed0fd6a947bd3c4973fe6b4bb8928162..b2c66f7a0d163dffa05a59bec1075c63b7d7b8b4 100644 (file)
--- a/tests/virlogtest.c
+++ b/tests/virlogtest.c
@@ -80,9 +80,10 @@ testLogParseFilters(const void *opaque)
 {
     int ret = -1;
     int nfilters;
+    virLogFilterPtr *filters = NULL;
     const struct testLogData *data = opaque;
 
-    nfilters = virLogParseAndDefineFilters(data->str);
+    nfilters = virLogParseFilters(data->str, &filters);
     if (nfilters < 0) {
         if (!data->pass) {
             VIR_TEST_DEBUG("Got expected error: %s\n",
@@ -102,7 +103,7 @@ testLogParseFilters(const void *opaque)
 
     ret = 0;
  cleanup:
-    virLogReset();
+    virLogFilterListFree(filters, nfilters);
     return ret;
 }