stats: Renamed mail-server-connection to fifo-input-connection.

diff --git a/src/stats/Makefile.am b/src/stats/Makefile.am
index e84ead1056f0d554f178426aa71678e0720eb93d..ec5ae7482dcd5dedf83e17d5357628d17832c906 100644 (file)
--- a/src/stats/Makefile.am
+++ b/src/stats/Makefile.am
@@ -17,11 +17,11 @@ stats_SOURCES = \
        client.c \
        client-export.c \
        client-reset.c \
+       fifo-input-connection.c \
        global-memory.c \
        mail-command.c \
        mail-domain.c \
        mail-ip.c \
-       mail-server-connection.c \
        mail-session.c \
        mail-stats.c \
        mail-user.c \
@@ -32,11 +32,11 @@ noinst_HEADERS = \
        client.h \
        client-export.h \
        client-reset.h \
+       fifo-input-connection.h \
        global-memory.h \
        mail-command.h \
        mail-domain.h \
        mail-ip.h \
-       mail-server-connection.h \
        mail-session.h \
        mail-stats.h \
        mail-user.h \

diff --git a/src/stats/mail-server-connection.c b/src/stats/fifo-input-connection.c
similarity index 67%
rename from src/stats/mail-server-connection.c
rename to src/stats/fifo-input-connection.c
index c45a1c05de48c45b8cb56ea8d9fda66b797aeea5..1bda765140452c00ad01821206fd8342943f771f 100644 (file)
--- a/src/stats/mail-server-connection.c
+++ b/src/stats/fifo-input-connection.c
@@ -7,20 +7,20 @@
 #include "master-service.h"
 #include "mail-session.h"
 #include "mail-command.h"
-#include "mail-server-connection.h"
+#include "fifo-input-connection.h"
 
 #include <unistd.h>
 
 #define MAX_INBUF_SIZE (PIPE_BUF*2)
 
-struct mail_server_connection {
+struct fifo_input_connection {
        int fd;
        struct istream *input;
        struct io *io;
 };
 
 static int
-mail_server_connection_request(const char *const *args, const char **error_r)
+fifo_input_connection_request(const char *const *args, const char **error_r)
 {
        const char *cmd = args[0];
 
@@ -43,41 +43,41 @@ mail_server_connection_request(const char *const *args, const char **error_r)
        return -1;
 }
 
-static void mail_server_connection_input(struct mail_server_connection *conn)
+static void fifo_input_connection_input(struct fifo_input_connection *conn)
 {
        const char *line, *const *args, *error;
 
        switch (i_stream_read(conn->input)) {
        case -2:
                i_error("BUG: Mail server sent too much data");
-               mail_server_connection_destroy(&conn);
+               fifo_input_connection_destroy(&conn);
                return;
        case -1:
-               mail_server_connection_destroy(&conn);
+               fifo_input_connection_destroy(&conn);
                return;
        }
 
        while ((line = i_stream_next_line(conn->input)) != NULL) T_BEGIN {
                args = t_strsplit_tabescaped(line);
-               if (mail_server_connection_request(args, &error) < 0)
+               if (fifo_input_connection_request(args, &error) < 0)
                        i_error("Mail server input error: %s", error);
        } T_END;
 }
 
-struct mail_server_connection *mail_server_connection_create(int fd)
+struct fifo_input_connection *fifo_input_connection_create(int fd)
 {
-       struct mail_server_connection *conn;
+       struct fifo_input_connection *conn;
 
-       conn = i_new(struct mail_server_connection, 1);
+       conn = i_new(struct fifo_input_connection, 1);
        conn->fd = fd;
        conn->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
-       conn->io = io_add(fd, IO_READ, mail_server_connection_input, conn);
+       conn->io = io_add(fd, IO_READ, fifo_input_connection_input, conn);
        return conn;
 }
 
-void mail_server_connection_destroy(struct mail_server_connection **_conn)
+void fifo_input_connection_destroy(struct fifo_input_connection **_conn)
 {
-       struct mail_server_connection *conn = *_conn;
+       struct fifo_input_connection *conn = *_conn;
 
        *_conn = NULL;
 

diff --git a/src/stats/fifo-input-connection.h b/src/stats/fifo-input-connection.h
new file mode 100644 (file)
index 0000000..af6bad6
--- /dev/null
+++ b/src/stats/fifo-input-connection.h
@@ -0,0 +1,7 @@
+#ifndef FIFO_INPUT_CONNECTION_H
+#define FIFO_INPUT_CONNECTION_H
+
+struct fifo_input_connection *fifo_input_connection_create(int fd);
+void fifo_input_connection_destroy(struct fifo_input_connection **conn);
+
+#endif

diff --git a/src/stats/mail-server-connection.h b/src/stats/mail-server-connection.h
deleted file mode 100644 (file)
index 4fd50e2..0000000
--- a/src/stats/mail-server-connection.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef MAIL_SERVER_CONNECTION_H
-#define MAIL_SERVER_CONNECTION_H
-
-struct mail_server_connection *mail_server_connection_create(int fd);
-void mail_server_connection_destroy(struct mail_server_connection **conn);
-
-#endif

diff --git a/src/stats/main.c b/src/stats/main.c
index 10200f9161755a76b4db866b4d6c7aa402975d96..e81ce505f448aeae9cef130cf710296ce73d1ef7 100644 (file)
--- a/src/stats/main.c
+++ b/src/stats/main.c
@@ -7,7 +7,7 @@
 #include "master-service-settings.h"
 #include "global-memory.h"
 #include "stats-settings.h"
-#include "mail-server-connection.h"
+#include "fifo-input-connection.h"
 #include "mail-command.h"
 #include "mail-session.h"
 #include "mail-user.h"
@@ -16,17 +16,17 @@
 #include "mail-stats.h"
 #include "client.h"
 
-static struct mail_server_connection *mail_server_conn = NULL;
+static struct fifo_input_connection *fifo_input_conn = NULL;
 static struct module *modules = NULL;
 
 static void client_connected(struct master_service_connection *conn)
 {
        if (conn->fifo) {
-               if (mail_server_conn != NULL) {
+               if (fifo_input_conn != NULL) {
                        i_error("Received another mail-server connection");
                        return;
                }
-               mail_server_conn = mail_server_connection_create(conn->fd);
+               fifo_input_conn = fifo_input_connection_create(conn->fd);
        } else {
                (void)client_create(conn->fd);
        }
@@ -92,8 +92,8 @@ int main(int argc, char *argv[])
        mail_ips_deinit();
        mail_global_deinit();
 
-       if (mail_server_conn != NULL)
-               mail_server_connection_destroy(&mail_server_conn);
+       if (fifo_input_conn != NULL)
+               fifo_input_connection_destroy(&fifo_input_conn);
 
        module_dir_unload(&modules);
        i_assert(global_used_memory == 0);

diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c
index 5ebcbe27a98c0286de745ae8d9411e0bf2137683..b274300a5139ce0e0bf9696f3aff983d96e5cab8 100644 (file)
--- a/src/stats/stats-settings.c
+++ b/src/stats/stats-settings.c
@@ -17,10 +17,12 @@ static buffer_t stats_unix_listeners_buf = {
        stats_unix_listeners, sizeof(stats_unix_listeners), { NULL, }
 };
 static struct file_listener_settings stats_fifo_listeners_array[] = {
-       { "stats-mail", 0600, "", "" }
+       { "stats-mail", 0600, "", "" },
+       { "stats-user", 0600, "", "" }
 };
 static struct file_listener_settings *stats_fifo_listeners[] = {
-       &stats_fifo_listeners_array[0]
+       &stats_fifo_listeners_array[0],
+       &stats_fifo_listeners_array[1]
 };
 static buffer_t stats_fifo_listeners_buf = {
        stats_fifo_listeners,