Merge branch '2.3' into 2.4

2020-01-09 06:59:00 +02:00 · 2020-01-09 06:59:00 +02:00 · 09c55111cc
commit 09c55111cc
parent b555115fa2 6e8318f72f
1 changed files with 10 additions and 0 deletions
--- a/server/core/filter.cc
+++ b/server/core/filter.cc
@ -156,6 +156,16 @@ void filter_destroy(const SFilterDef& filter)
 {
    mxb_assert(filter);
    mxb_assert(filter_can_be_destroyed(filter));
+
+    char filename[PATH_MAX + 1];
+    snprintf(filename, sizeof(filename), "%s/%s.cnf", get_config_persistdir(), filter->name.c_str());
+
+    if (unlink(filename) == -1 && errno != ENOENT)
+    {
+        MXS_ERROR("Failed to remove persisted filter configuration at '%s': %d, %s",
+                  filename, errno, mxs_strerror(errno));
+    }
+
    filter_free(filter);
 }