From 6e8318f72ffc26463748daecbc33a069dc748008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 8 Jan 2020 15:29:07 +0200 Subject: [PATCH] MXS-2829: Remove config file when deleting a filter --- server/core/filter.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/core/filter.cc b/server/core/filter.cc index d115c24ba..3da885179 100644 --- a/server/core/filter.cc +++ b/server/core/filter.cc @@ -181,6 +181,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); }