global: Remove event fields no longer necessary for settings lookups

settings_filter_names are now used for settings lookups.

diff --git a/src/lib-dict-backend/dict-sql-settings.c b/src/lib-dict-backend/dict-sql-settings.c
index eda6d73fb60d02e72856090be942ac53f6f1eee8..24a8c5cf80a197890f689333b3c28a82c74cb832 100644 (file)
--- a/src/lib-dict-backend/dict-sql-settings.c
+++ b/src/lib-dict-backend/dict-sql-settings.c
@@ -306,7 +306,6 @@ int dict_sql_settings_get(struct event *event,
        if (array_is_created(&maps_set->maps)) {
                array_foreach_elem(&maps_set->maps, name) {
                        struct event *map_event = event_create(event);
-                       event_add_str(map_event, "dict_map", name);
                        settings_event_add_list_filter_name(map_event,
                                                            "dict_map", name);
                        if (dict_sql_map_settings_get(map_event, set, &error) < 0) {

diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c
index eaa13a26b3ae9bc9385e34552525924480a81ae4..fba4ea7c6c1548b7ee67200a3655cdf89438ce7a 100644 (file)
--- a/src/lib-sql/driver-sqlpool.c
+++ b/src/lib-sql/driver-sqlpool.c
@@ -286,7 +286,6 @@ sqlpool_add_connection(struct sqlpool_db *db, struct sqlpool_host *host,
 
        struct event *event = event_create(db->api.event);
        event_set_ptr(event, SQLPOOL_EVENT_PTR, "yes");
-       event_add_str(event, db->filter_name, host->hostname);
        settings_event_add_list_filter_name(event, db->filter_name, host->hostname);
        ret = db->driver->v.init(event, &conndb, &error);
        event_unref(&event);

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 25820673363d5fd71081a57ff41b43bf50626b73..5db29c03dbe3f10e82187324f5961810b46d5dcc 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -434,8 +434,7 @@ static bool service_is_enabled(const struct master_settings *set,
 }
 
 static bool
-master_service_get_file_listeners(struct service_settings *service_set,
-                                 pool_t pool, struct event *event,
+master_service_get_file_listeners(pool_t pool, struct event *event,
                                  const char *set_name, const char *service_name,
                                  const struct setting_parser_info *info,
                                  const ARRAY_TYPE(const_string) *listener_names,
@@ -450,7 +449,6 @@ master_service_get_file_listeners(struct service_settings *service_set,
                return TRUE;
 
        event = event_create(event);
-       event_add_str(event, "service", service_set->name);
        settings_event_add_list_filter_name(event, "service", service_name);
 
        p_array_init(parsed_listeners, pool, array_count(listener_names));
@@ -488,7 +486,6 @@ master_service_get_inet_listeners(struct service_settings *service_set,
                return TRUE;
 
        event = event_create(event);
-       event_add_str(event, "service", service_set->name);
        settings_event_add_list_filter_name(event, "service", service_name);
 
        p_array_init(&service_set->parsed_inet_listeners, pool,
@@ -504,7 +501,6 @@ master_service_get_inet_listeners(struct service_settings *service_set,
                        break;
                }
 
-               event_add_str(event, "inet_listener", name);
                struct event *event2 = event_create(event);
                settings_event_add_list_filter_name(event2, "inet_listener",
                                                    name);
@@ -567,16 +563,14 @@ master_settings_get_services(struct master_settings *set, pool_t pool,
                array_push_back(&set->parsed_services, &service_set_dup);
                settings_free(service_set);
 
-               if (!master_service_get_file_listeners(
-                               service_set_dup, pool, event,
+               if (!master_service_get_file_listeners(pool, event,
                                "unix_listener", service_name,
                                &unix_listener_setting_parser_info,
                                &service_set_dup->unix_listeners,
                                &service_set_dup->parsed_unix_listeners,
                                error_r))
                        return FALSE;
-               if (!master_service_get_file_listeners(
-                               service_set_dup, pool, event,
+               if (!master_service_get_file_listeners(pool, event,
                                "fifo_listener", service_name,
                                &fifo_listener_setting_parser_info,
                                &service_set_dup->fifo_listeners,

diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index a22e202eb0c9f1a0800e2ddca3f01282b7bbe918..0dfb5c81fcefdc72d2a59afc435da9d1c40078b7 100644 (file)
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -88,7 +88,6 @@ static int stats_exporters_add_filter(struct stats_metrics *metrics,
                ret = -1;
        } else {
                struct event *event = event_create(metrics->event);
-               event_add_str(event, "event_exporter", filter_name);
                settings_event_add_list_filter_name(event, "event_exporter",
                                                    filter_name);
                ret = stats_exporters_add_set(metrics, event, set, error_r);
@@ -301,13 +300,9 @@ stats_metrics_get_group_by(struct event *event,
                        ret = -1;
                } else {
                        struct event *group_event = event_create(event);
-                       event_add_str(group_event, "metric_group_by",
-                                     group_by_name);
                        settings_event_add_list_filter_name(group_event,
                                "metric_group_by", group_by_name);
                        struct event *method_event = event_create(group_event);
-                       event_add_str(group_event, "metric_group_by_method",
-                                     array_idx_elem(&group_by_set->method, 0));
                        settings_event_add_list_filter_name(method_event,
                                "metric_group_by_method",
                                array_idx_elem(&group_by_set->method, 0));
@@ -344,7 +339,6 @@ static int stats_metrics_add_filter(struct stats_metrics *metrics,
        } else {
                ARRAY_TYPE(stats_metric_settings_group_by) group_by;
                struct event *event = event_create(metrics->event);
-               event_add_str(event, "metric", filter_name);
                settings_event_add_list_filter_name(event, "metric",
                                                    filter_name);
                ret = stats_metrics_get_group_by(event, set, &group_by, error_r);