stats: Rename struct exporter to event_exporter

diff --git a/src/stats/event-exporter-transport-drop.c b/src/stats/event-exporter-transport-drop.c
index 06663e25f1cb6abd58ba92d0aa409ea088ba6dc5..c19ea4dabee5e3bfcac0b0359f8a9940428843db 100644 (file)
--- a/src/stats/event-exporter-transport-drop.c
+++ b/src/stats/event-exporter-transport-drop.c
@@ -4,7 +4,7 @@
 #include "event-exporter.h"
 
 static void
-event_exporter_drop_send(struct exporter *exporter ATTR_UNUSED,
+event_exporter_drop_send(struct event_exporter *exporter ATTR_UNUSED,
                         const buffer_t *buf ATTR_UNUSED)
 {
 }

diff --git a/src/stats/event-exporter-transport-file.c b/src/stats/event-exporter-transport-file.c
index e2640ef7eb2d820dbb1076e3ed01765bb895b2d7..a456eca9f43ab8aa9fc1fa8a6b010e0078174388 100644 (file)
--- a/src/stats/event-exporter-transport-file.c
+++ b/src/stats/event-exporter-transport-file.c
@@ -61,8 +61,8 @@ static void event_exporter_file_deinit(void)
        }
 }
 
-static struct exporter_file *exporter_file_init(const struct exporter *exporter,
-                                               bool unix_socket)
+static struct exporter_file *
+exporter_file_init(const struct event_exporter *exporter, bool unix_socket)
 {
        struct exporter_file *node;
        node = i_new(struct exporter_file, 1);
@@ -143,7 +143,7 @@ static void event_exporter_file_write(struct exporter_file *node,
 }
 
 static void
-event_exporter_file_send(struct exporter *exporter, const buffer_t *buf)
+event_exporter_file_send(struct event_exporter *exporter, const buffer_t *buf)
 {
        struct exporter_file *node = exporter->transport_context;
        if (node == NULL)
@@ -154,7 +154,7 @@ event_exporter_file_send(struct exporter *exporter, const buffer_t *buf)
 }
 
 static void
-event_exporter_unix_send(struct exporter *exporter, const buffer_t *buf)
+event_exporter_unix_send(struct event_exporter *exporter, const buffer_t *buf)
 {
        struct exporter_file *node = exporter->transport_context;
        if (node == NULL)

diff --git a/src/stats/event-exporter-transport-http-post.c b/src/stats/event-exporter-transport-http-post.c
index 9a5fc47233356298455abd705bfd9db3687e7ec6..333da70a612963b81b387b2a225e6578df1cc2d6 100644 (file)
--- a/src/stats/event-exporter-transport-http-post.c
+++ b/src/stats/event-exporter-transport-http-post.c
@@ -46,7 +46,8 @@ static void response_fxn(const struct http_response *response,
 }
 
 static void
-event_exporter_http_post_send(struct exporter *exporter, const buffer_t *buf)
+event_exporter_http_post_send(struct event_exporter *exporter,
+                             const buffer_t *buf)
 {
        struct http_client_request *req;
 

diff --git a/src/stats/event-exporter-transport-log.c b/src/stats/event-exporter-transport-log.c
index 3adceb2793d2876a2afeec2e1d0471c2745da5fc..262a2ac1daa00260f730f0e615bc694de07a387c 100644 (file)
--- a/src/stats/event-exporter-transport-log.c
+++ b/src/stats/event-exporter-transport-log.c
@@ -6,7 +6,7 @@
 #include "event-exporter.h"
 
 static void
-event_exporter_log_send(struct exporter *exporter ATTR_UNUSED,
+event_exporter_log_send(struct event_exporter *exporter ATTR_UNUSED,
                        const buffer_t *buf)
 {
        i_info("%.*s", (int)buf->used, (const char *)buf->data);

diff --git a/src/stats/event-exporter.h b/src/stats/event-exporter.h
index 9003fb5876ae8365dbe9f5ec2f9b3d91b92aa54e..534d4f8e1021f4adde6ca55167df0dce7c3b4200 100644 (file)
--- a/src/stats/event-exporter.h
+++ b/src/stats/event-exporter.h
@@ -9,7 +9,7 @@ struct event_exporter_transport {
        void (*deinit)(void);
 
        /* function to send the event */
-       void (*send)(struct exporter *exporter, const buffer_t *buf);
+       void (*send)(struct event_exporter *exporter, const buffer_t *buf);
 
        void (*reopen)(void);
 };
@@ -44,7 +44,7 @@ void event_export_helper_fmt_categories(string_t *dest,
                                        const char *separator);
 
 /* assign transport context to a event exporter */
-void event_export_transport_assign_context(const struct exporter *exporter,
+void event_export_transport_assign_context(const struct event_exporter *exporter,
                                           void *context);
 
 #endif

diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index e19c63aff832c8b800e1056a3c2e8460890506b5..c862f00aea82673dfbf8cbdfea8c2411f0b5f659 100644 (file)
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -22,7 +22,7 @@ struct stats_metrics {
        pool_t pool;
        struct event *event;
        struct event_filter *filter; /* stats & export */
-       ARRAY(struct exporter *) exporters;
+       ARRAY(struct event_exporter *) exporters;
        ARRAY(struct metric *) metrics;
 };
 
@@ -35,9 +35,9 @@ static void stats_metric_free(struct metric *metric);
 static void stats_exporters_add_set(struct stats_metrics *metrics,
                                    const struct stats_exporter_settings *set)
 {
-       struct exporter *exporter;
+       struct event_exporter *exporter;
 
-       exporter = p_new(metrics->pool, struct exporter, 1);
+       exporter = p_new(metrics->pool, struct event_exporter, 1);
        exporter->name = p_strdup(metrics->pool, set->name);
        exporter->transport_args = p_strdup(metrics->pool, set->transport_args);
        exporter->transport_timeout = set->transport_timeout;
@@ -71,10 +71,10 @@ static void stats_exporters_add_set(struct stats_metrics *metrics,
        array_push_back(&metrics->exporters, &exporter);
 }
 
-void event_export_transport_assign_context(const struct exporter *exporter,
+void event_export_transport_assign_context(const struct event_exporter *exporter,
                                           void *context)
 {
-       struct exporter *ptr = (struct exporter *)exporter;
+       struct event_exporter *ptr = (struct event_exporter *)exporter;
        ptr->transport_context = context;
 }
 
@@ -122,11 +122,11 @@ stats_metric_alloc(pool_t pool, const char *name,
        return metric;
 }
 
-static struct exporter *
+static struct event_exporter *
 stats_metrics_exporter_find(struct stats_metrics *metrics,
                            const char *name)
 {
-       struct exporter *exporter;
+       struct event_exporter *exporter;
 
        array_foreach_elem(&metrics->exporters, exporter) {
                if (strcmp(name, exporter->name) == 0)
@@ -139,7 +139,7 @@ static int stats_metrics_add_set(struct stats_metrics *metrics,
                                 const struct stats_metric_settings *set,
                                 const char **error_r)
 {
-       struct exporter *exporter = NULL;
+       struct event_exporter *exporter = NULL;
        struct metric *metric;
        const char *const *fields;
        const char *const *tmp;
@@ -236,7 +236,7 @@ stats_metrics_find(struct stats_metrics *metrics,
 static bool
 stats_metrics_check_for_exporter(struct stats_metrics *metrics, const char *name)
 {
-       struct exporter *exporter;
+       struct event_exporter *exporter;
 
        /* Allow registering metrics with empty/missing exporters. */
        if (name[0] == '\0')
@@ -794,7 +794,7 @@ static void
 stats_export_event(struct metric *metric, struct event *oldevent)
 {
        const struct metric_export_info *info = &metric->export_info;
-       struct exporter *exporter = info->exporter;
+       struct event_exporter *exporter = info->exporter;
        struct event *event;
 
        i_assert(exporter != NULL);

diff --git a/src/stats/stats-metrics.h b/src/stats/stats-metrics.h
index a9968c035bbeb69fddfd89ceb2a3b9ae34d19cbd..8a03ad219873a57cc24365cf4a0e9678351b27bd 100644 (file)
--- a/src/stats/stats-metrics.h
+++ b/src/stats/stats-metrics.h
@@ -9,7 +9,7 @@
 struct metric;
 struct stats_metrics;
 
-struct exporter {
+struct event_exporter {
        const char *name;
 
        /*
@@ -41,7 +41,7 @@ struct exporter {
 };
 
 struct metric_export_info {
-       struct exporter *exporter;
+       struct event_exporter *exporter;
 
        enum event_exporter_includes {
                EVENT_EXPORTER_INCL_NONE       = 0,