lib-master: Rename master_service_log_debug_parse() to master_service_log_filter_parse()

This function will be used for parsing other settings besides just
log_debug.

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index eac9f90eac6156f7cbbd95926f6fa7552caa11dd..5ee7382a75f5077eaf65a4e6a988e9a0babf5d9a 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -104,8 +104,8 @@ const struct setting_parser_info master_service_setting_parser_info = {
 };
 
 /* <settings checks> */
-int master_service_log_debug_parse(struct event_filter *filter, const char *str,
-                                  const char **error_r)
+int master_service_log_filter_parse(struct event_filter *filter, const char *str,
+                                   const char **error_r)
 {
        const char *categories[2] = { NULL, NULL };
        struct event_filter_query query = {
@@ -140,7 +140,7 @@ master_service_settings_check(void *_set, pool_t pool ATTR_UNUSED,
        }
        struct event_filter *filter = event_filter_create();
        const char *error;
-       if (master_service_log_debug_parse(filter, set->log_debug, &error) < 0) {
+       if (master_service_log_filter_parse(filter, set->log_debug, &error) < 0) {
                *error_r = t_strdup_printf("Invalid log_debug: %s", error);
                event_filter_unref(&filter);
                return FALSE;

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index d987555a75a194281d3feeb09922dadabc18926b..3097ca6a4f7ff9ebc81a6d0f5cf8a3c5478fdf03 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -99,8 +99,8 @@ int master_service_set(struct master_service *service, const char *line);
 bool master_service_set_has_config_override(struct master_service *service,
                                            const char *key);
 
-/* Parse log_debug setting into an event filter. */
-int master_service_log_debug_parse(struct event_filter *filter, const char *str,
-                                  const char **error_r);
+/* Parse log filter setting into an event filter. */
+int master_service_log_filter_parse(struct event_filter *filter, const char *str,
+                                   const char **error_r);
 
 #endif

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 02d6735edf5399f78ef2385d5fd941d06101f085..7cc91427219a3bc7410c8e38ada4c7e670cc2405 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -279,7 +279,7 @@ master_service_init(const char *name, enum master_service_flags flags,
        if (value != NULL) {
                struct event_filter *filter = event_filter_create();
                const char *error;
-               if (master_service_log_debug_parse(filter, value, &error) < 0) {
+               if (master_service_log_filter_parse(filter, value, &error) < 0) {
                        i_error("Invalid "DOVECOT_LOG_DEBUG_ENV" - ignoring: %s",
                                error);
                }