global: Renamed stats plugin and service to old-stats

diff --git a/configure.ac b/configure.ac
index a5a91e43c69aa7f8cc95787a164e89f88b600e5e..5413efb84b2265875b4514bcb8577209a27fadb5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -627,7 +627,7 @@ LIBDOVECOT_LA_LIBS='\
        $(top_builddir)/src/lib-program-client/libprogram_client.la \
        $(top_builddir)/src/lib-master/libmaster.la \
        $(top_builddir)/src/lib-settings/libsettings.la \
-       $(top_builddir)/src/lib-stats/libstats.la \
+       $(top_builddir)/src/lib-old-stats/libold_stats.la \
        $(top_builddir)/src/lib-http/libhttp.la \
        $(top_builddir)/src/lib-fs/libfs.la \
        $(top_builddir)/src/lib-dict/libdict.la \
@@ -854,7 +854,7 @@ src/lib-sasl/Makefile
 src/lib-settings/Makefile
 src/lib-smtp/Makefile
 src/lib-ssl-iostream/Makefile
-src/lib-stats/Makefile
+src/lib-old-stats/Makefile
 src/lib-test/Makefile
 src/lib-storage/Makefile
 src/lib-storage/list/Makefile
@@ -895,7 +895,7 @@ src/submission-login/Makefile
 src/replication/Makefile
 src/replication/aggregator/Makefile
 src/replication/replicator/Makefile
-src/stats/Makefile
+src/old-stats/Makefile
 src/util/Makefile
 src/plugins/Makefile
 src/plugins/acl/Makefile
@@ -922,8 +922,8 @@ src/plugins/quota-clone/Makefile
 src/plugins/imap-quota/Makefile
 src/plugins/replication/Makefile
 src/plugins/snarf/Makefile
-src/plugins/stats/Makefile
-src/plugins/imap-stats/Makefile
+src/plugins/old-stats/Makefile
+src/plugins/imap-old-stats/Makefile
 src/plugins/trash/Makefile
 src/plugins/virtual/Makefile
 src/plugins/welcome/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 7bcf4d3bac5454ccc6a441ae0176acb7a5dda210..a02adeaae859a24a1ac4288e54405add2d0c978e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ LIBDOVECOT_SUBDIRS = \
        lib-dns \
        lib-dict \
        lib-sasl \
-       lib-stats \
+       lib-old-stats \
        lib-http \
        lib-fs \
        lib-mail \
@@ -68,5 +68,5 @@ SUBDIRS = \
        replication \
        util \
        doveadm \
-       stats \
+       old-stats \
        plugins

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 0d49dbfacbe1767634e9767bd04e19203a5daccf..873c7c46d79713c786f0b0bb642ec507d468b96e 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-http \
        -I$(top_srcdir)/src/lib-sql \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-stats \
+       -I$(top_srcdir)/src/lib-old-stats \
        -I$(top_srcdir)/src/lib-ntlm \
        -I$(top_srcdir)/src/lib-otp \
        -I$(top_srcdir)/src/lib-master \

diff --git a/src/auth/auth-request-stats.c b/src/auth/auth-request-stats.c
index 866a89cd8b0850cdc793fe98aec36195dcea7858..e6a29d165858533cb852cd2b3b015808341cb041 100644 (file)
--- a/src/auth/auth-request-stats.c
+++ b/src/auth/auth-request-stats.c
@@ -11,7 +11,7 @@
 #include "auth-request.h"
 #include "auth-request-stats.h"
 
-#define USER_STATS_SOCKET_NAME "stats-user"
+#define USER_STATS_SOCKET_NAME "old-stats-user"
 
 static struct stats_connection *auth_stats_conn = NULL;
 static struct stats_item *auth_stats_item;

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index f9e9ad4ad96f1ab9cc297483bba967d843fd5a1a..cc361180ce964997ceac35f4673ab75e8f9e62fc 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -83,7 +83,7 @@ doveadm_common_cmds = \
        doveadm-proxy.c \
        doveadm-replicator.c \
        doveadm-sis.c \
-       doveadm-stats.c \
+       doveadm-oldstats.c \
        doveadm-who.c
 
 doveadm_common_mail_cmds = \

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 5ca1742e617dacc9f78f3a5781bdc7a0c92a037d..d4fdfba5e57f101975e9e24564cc92d4b2d91afc 100644 (file)
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -24,8 +24,8 @@ static struct doveadm_cmd_ver2 *doveadm_commands_ver2[] = {
        &doveadm_cmd_process_status_ver2,
        &doveadm_cmd_stop_ver2,
        &doveadm_cmd_reload_ver2,
-       &doveadm_cmd_stats_dump_ver2,
-       &doveadm_cmd_stats_reset_ver2,
+       &doveadm_cmd_oldstats_dump_ver2,
+       &doveadm_cmd_oldstats_reset_ver2,
        &doveadm_cmd_penalty_ver2,
        &doveadm_cmd_kick_ver2,
        &doveadm_cmd_who_ver2

diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index e65f842196cf23e0c6ec1ce2e9cf052ac39c0aa0..729d3eb0535318924a8b4808582ab6fa37e4efe6 100644 (file)
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -154,9 +154,9 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_service_status_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_process_status_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2;
-extern struct doveadm_cmd_ver2 doveadm_cmd_stats_reset_ver2;
-extern struct doveadm_cmd_ver2 doveadm_cmd_stats_dump_ver2;
-extern struct doveadm_cmd_ver2 doveadm_cmd_stats_top_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_reset_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_dump_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_top_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_penalty_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_kick_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_who_ver2;

diff --git a/src/doveadm/doveadm-stats.c b/src/doveadm/doveadm-oldstats.c
similarity index 96%
rename from src/doveadm/doveadm-stats.c
rename to src/doveadm/doveadm-oldstats.c
index d2d1faa4ef43b1081945ed8a4693c780fb8aa2a2..cd8c7a9f19e132066050d2ddf58b939d6e8e2d77 100644 (file)
--- a/src/doveadm/doveadm-stats.c
+++ b/src/doveadm/doveadm-oldstats.c
@@ -118,7 +118,7 @@ doveadm_cmd_stats_dump(struct doveadm_cmd_context* cctx)
        const char *args[3] = {0};
 
        if (!doveadm_cmd_param_str(cctx, "socket-path", &path))
-               path = t_strconcat(doveadm_settings->base_dir, "/stats", NULL);
+               path = t_strconcat(doveadm_settings->base_dir, "/old-stats", NULL);
 
        if (!doveadm_cmd_param_str(cctx, "type", &args[0])) {
                i_error("Missing type parameter");
@@ -544,7 +544,7 @@ static void cmd_stats_top(int argc, char *argv[])
        const char *path, *sort_type;
        int c;
 
-       path = t_strconcat(doveadm_settings->base_dir, "/stats", NULL);
+       path = t_strconcat(doveadm_settings->base_dir, "/old-stats", NULL);
 
        while ((c = getopt(argc, argv, "bs:")) > 0) {
                switch (c) {
@@ -556,14 +556,14 @@ static void cmd_stats_top(int argc, char *argv[])
                        path = optarg;
                        break;
                default:
-                       help_ver2(&doveadm_cmd_stats_top_ver2);
+                       help_ver2(&doveadm_cmd_oldstats_top_ver2);
                }
        }
        argv += optind - 1;
        if (argv[1] == NULL)
                sort_type = "disk";
        else if (argv[2] != NULL)
-               help_ver2(&doveadm_cmd_stats_top_ver2);
+               help_ver2(&doveadm_cmd_oldstats_top_ver2);
        else
                sort_type = argv[1];
 
@@ -576,14 +576,14 @@ static void cmd_stats_reset(int argc, char *argv[])
        const char *path;
        int c;
 
-       path = t_strconcat(doveadm_settings->base_dir, "/stats", NULL);
+       path = t_strconcat(doveadm_settings->base_dir, "/old-stats", NULL);
        while((c = getopt(argc, argv, "s:")) > 0) {
                switch (c) {
                case 's':
                        path = optarg;
                        break;
                default:
-                       help_ver2(&doveadm_cmd_stats_reset_ver2);
+                       help_ver2(&doveadm_cmd_oldstats_reset_ver2);
                }
        }
        argv += optind - 1;
@@ -595,9 +595,9 @@ static void cmd_stats_reset(int argc, char *argv[])
        stats_reset(path, (const char**)argv);
 }
 
-struct doveadm_cmd_ver2 doveadm_cmd_stats_dump_ver2 = {
+struct doveadm_cmd_ver2 doveadm_cmd_oldstats_dump_ver2 = {
        .cmd = doveadm_cmd_stats_dump,
-       .name = "stats dump",
+       .name = "oldstats dump",
        .usage = "[-s <stats socket path>] <type> [<filter>]",
 DOVEADM_CMD_PARAMS_START
 DOVEADM_CMD_PARAM('s', "socket-path", CMD_PARAM_STR, 0)
@@ -606,9 +606,9 @@ DOVEADM_CMD_PARAM('\0', "filter", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
 DOVEADM_CMD_PARAMS_END
 };
 
-struct doveadm_cmd_ver2 doveadm_cmd_stats_top_ver2 = {
+struct doveadm_cmd_ver2 doveadm_cmd_oldstats_top_ver2 = {
        .old_cmd = cmd_stats_top,
-       .name = "stats top",
+       .name = "oldstats top",
        .usage = "[-s <stats socket path>] [-b] [<sort field>]",
 DOVEADM_CMD_PARAMS_START
 DOVEADM_CMD_PARAM('s', "socket-path", CMD_PARAM_STR, 0)
@@ -618,9 +618,9 @@ DOVEADM_CMD_PARAMS_END
 };
 
 
-struct doveadm_cmd_ver2 doveadm_cmd_stats_reset_ver2 = {
+struct doveadm_cmd_ver2 doveadm_cmd_oldstats_reset_ver2 = {
        .old_cmd = cmd_stats_reset,
-       .name = "stats reset",
+       .name = "oldstats reset",
        .usage = "[-s <stats socket path>]",
 DOVEADM_CMD_PARAMS_START
 DOVEADM_CMD_PARAM('s', "socket-path", CMD_PARAM_STR, 0)

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 6a45c4f7767fb4ddf5bd5d0c9b5530c3d0cadbbb..9ebc9e98a07c107beb19aab5c7ffabb95f5bdff6 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
        for (i = 0; i < N_ELEMENTS(doveadm_cmdline_commands); i++)
                doveadm_register_cmd(doveadm_cmdline_commands[i]);
        doveadm_register_auth_commands();
-       doveadm_cmd_register_ver2(&doveadm_cmd_stats_top_ver2);
+       doveadm_cmd_register_ver2(&doveadm_cmd_oldstats_top_ver2);
 
        if (cmd_name != NULL && (quick_init ||
                                 strcmp(cmd_name, "config") == 0 ||

diff --git a/src/lib-stats/Makefile.am b/src/lib-old-stats/Makefile.am
similarity index 79%
rename from src/lib-stats/Makefile.am
rename to src/lib-old-stats/Makefile.am
index d06f3bc0c8f31aafd07d6a891635705c5a6226f8..f97cf6226148743d579e3d7dd85966ad88ca7fc6 100644 (file)
--- a/src/lib-stats/Makefile.am
+++ b/src/lib-old-stats/Makefile.am
@@ -1,10 +1,10 @@
-noinst_LTLIBRARIES = libstats.la
+noinst_LTLIBRARIES = libold_stats.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-master
 
-libstats_la_SOURCES = \
+libold_stats_la_SOURCES = \
        stats.c \
        stats-connection.c \
        stats-parser.c

diff --git a/src/lib-stats/stats-connection.c b/src/lib-old-stats/stats-connection.c
similarity index 100%
rename from src/lib-stats/stats-connection.c
rename to src/lib-old-stats/stats-connection.c

diff --git a/src/lib-stats/stats-connection.h b/src/lib-old-stats/stats-connection.h
similarity index 100%
rename from src/lib-stats/stats-connection.h
rename to src/lib-old-stats/stats-connection.h

diff --git a/src/lib-stats/stats-parser.c b/src/lib-old-stats/stats-parser.c
similarity index 100%
rename from src/lib-stats/stats-parser.c
rename to src/lib-old-stats/stats-parser.c

diff --git a/src/lib-stats/stats-parser.h b/src/lib-old-stats/stats-parser.h
similarity index 100%
rename from src/lib-stats/stats-parser.h
rename to src/lib-old-stats/stats-parser.h

diff --git a/src/lib-stats/stats.c b/src/lib-old-stats/stats.c
similarity index 100%
rename from src/lib-stats/stats.c
rename to src/lib-old-stats/stats.c

diff --git a/src/lib-stats/stats.h b/src/lib-old-stats/stats.h
similarity index 100%
rename from src/lib-stats/stats.h
rename to src/lib-old-stats/stats.h

diff --git a/src/stats/Makefile.am b/src/old-stats/Makefile.am
similarity index 71%
rename from src/stats/Makefile.am
rename to src/old-stats/Makefile.am
index 3939f8864a9954c86bdc6d9f81031face60f35b3..8cb9c2fa628dc186e6914fbe4e19873cc589d18d 100644 (file)
--- a/src/stats/Makefile.am
+++ b/src/old-stats/Makefile.am
@@ -1,22 +1,22 @@
-stats_moduledir = $(moduledir)/stats
+old_stats_moduledir = $(moduledir)/old-stats
 pkglibexecdir = $(libexecdir)/dovecot
 
-pkglibexec_PROGRAMS = stats
+pkglibexec_PROGRAMS = old-stats
 
 AM_CPPFLAGS = \
-       -DSTATS_MODULE_DIR=\""$(stats_moduledir)"\" \
+       -DSTATS_MODULE_DIR=\""$(old_stats_moduledir)"\" \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-master \
-       -I$(top_srcdir)/src/lib-stats \
+       -I$(top_srcdir)/src/lib-old-stats \
        $(BINARY_CFLAGS)
 
-stats_LDADD = $(LIBDOVECOT) \
+old_stats_LDADD = $(LIBDOVECOT) \
        $(BINARY_LDFLAGS)
 
-stats_DEPENDENCIES = $(LIBDOVECOT_DEPS)
+old_stats_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
-stats_SOURCES = \
+old_stats_SOURCES = \
        client.c \
        client-export.c \
        client-reset.c \

diff --git a/src/stats/client-export.c b/src/old-stats/client-export.c
similarity index 100%
rename from src/stats/client-export.c
rename to src/old-stats/client-export.c

diff --git a/src/stats/client-export.h b/src/old-stats/client-export.h
similarity index 100%
rename from src/stats/client-export.h
rename to src/old-stats/client-export.h

diff --git a/src/stats/client-reset.c b/src/old-stats/client-reset.c
similarity index 100%
rename from src/stats/client-reset.c
rename to src/old-stats/client-reset.c

diff --git a/src/stats/client-reset.h b/src/old-stats/client-reset.h
similarity index 100%
rename from src/stats/client-reset.h
rename to src/old-stats/client-reset.h

diff --git a/src/stats/client.c b/src/old-stats/client.c
similarity index 100%
rename from src/stats/client.c
rename to src/old-stats/client.c

diff --git a/src/stats/client.h b/src/old-stats/client.h
similarity index 100%
rename from src/stats/client.h
rename to src/old-stats/client.h

diff --git a/src/stats/fifo-input-connection.c b/src/old-stats/fifo-input-connection.c
similarity index 100%
rename from src/stats/fifo-input-connection.c
rename to src/old-stats/fifo-input-connection.c

diff --git a/src/stats/fifo-input-connection.h b/src/old-stats/fifo-input-connection.h
similarity index 100%
rename from src/stats/fifo-input-connection.h
rename to src/old-stats/fifo-input-connection.h

diff --git a/src/stats/global-memory.c b/src/old-stats/global-memory.c
similarity index 100%
rename from src/stats/global-memory.c
rename to src/old-stats/global-memory.c

diff --git a/src/stats/global-memory.h b/src/old-stats/global-memory.h
similarity index 100%
rename from src/stats/global-memory.h
rename to src/old-stats/global-memory.h

diff --git a/src/stats/mail-command.c b/src/old-stats/mail-command.c
similarity index 100%
rename from src/stats/mail-command.c
rename to src/old-stats/mail-command.c

diff --git a/src/stats/mail-command.h b/src/old-stats/mail-command.h
similarity index 100%
rename from src/stats/mail-command.h
rename to src/old-stats/mail-command.h

diff --git a/src/stats/mail-domain.c b/src/old-stats/mail-domain.c
similarity index 100%
rename from src/stats/mail-domain.c
rename to src/old-stats/mail-domain.c

diff --git a/src/stats/mail-domain.h b/src/old-stats/mail-domain.h
similarity index 100%
rename from src/stats/mail-domain.h
rename to src/old-stats/mail-domain.h

diff --git a/src/stats/mail-ip.c b/src/old-stats/mail-ip.c
similarity index 100%
rename from src/stats/mail-ip.c
rename to src/old-stats/mail-ip.c

diff --git a/src/stats/mail-ip.h b/src/old-stats/mail-ip.h
similarity index 100%
rename from src/stats/mail-ip.h
rename to src/old-stats/mail-ip.h

diff --git a/src/stats/mail-session.c b/src/old-stats/mail-session.c
similarity index 100%
rename from src/stats/mail-session.c
rename to src/old-stats/mail-session.c

diff --git a/src/stats/mail-session.h b/src/old-stats/mail-session.h
similarity index 100%
rename from src/stats/mail-session.h
rename to src/old-stats/mail-session.h

diff --git a/src/stats/mail-stats.c b/src/old-stats/mail-stats.c
similarity index 100%
rename from src/stats/mail-stats.c
rename to src/old-stats/mail-stats.c

diff --git a/src/stats/mail-stats.h b/src/old-stats/mail-stats.h
similarity index 100%
rename from src/stats/mail-stats.h
rename to src/old-stats/mail-stats.h

diff --git a/src/stats/mail-user.c b/src/old-stats/mail-user.c
similarity index 100%
rename from src/stats/mail-user.c
rename to src/old-stats/mail-user.c

diff --git a/src/stats/mail-user.h b/src/old-stats/mail-user.h
similarity index 100%
rename from src/stats/mail-user.h
rename to src/old-stats/mail-user.h

diff --git a/src/stats/main.c b/src/old-stats/main.c
similarity index 98%
rename from src/stats/main.c
rename to src/old-stats/main.c
index b3c8a43841e1d1a2f5770ed7f99a4ea13191c954..8ebd9643cb0ab17b66d030838047720b333e1a86 100644 (file)
--- a/src/stats/main.c
+++ b/src/old-stats/main.c
@@ -45,7 +45,7 @@ static void main_preinit(void)
 int main(int argc, char *argv[])
 {
        const struct setting_parser_info *set_roots[] = {
-               &stats_setting_parser_info,
+               &old_stats_setting_parser_info,
                NULL
        };
        const enum master_service_flags service_flags =

diff --git a/src/stats/stats-carbon.c b/src/old-stats/stats-carbon.c
similarity index 100%
rename from src/stats/stats-carbon.c
rename to src/old-stats/stats-carbon.c

diff --git a/src/stats/stats-carbon.h b/src/old-stats/stats-carbon.h
similarity index 100%
rename from src/stats/stats-carbon.h
rename to src/old-stats/stats-carbon.h

diff --git a/src/stats/stats-settings.c b/src/old-stats/stats-settings.c
similarity index 50%
rename from src/stats/stats-settings.c
rename to src/old-stats/stats-settings.c
index 6bc211779e6a41cdb2373744537d7cc613751026..f7e1d975c6f6edd7c9b04fb8bee27c95939bd1c4 100644 (file)
--- a/src/stats/stats-settings.c
+++ b/src/old-stats/stats-settings.c
@@ -7,31 +7,31 @@
 #include "stats-settings.h"
 
 /* <settings checks> */
-static struct file_listener_settings stats_unix_listeners_array[] = {
-       { "stats", 0600, "", "" }
+static struct file_listener_settings old_stats_unix_listeners_array[] = {
+       { "old-stats", 0600, "", "" }
 };
-static struct file_listener_settings *stats_unix_listeners[] = {
-       &stats_unix_listeners_array[0]
+static struct file_listener_settings *old_stats_unix_listeners[] = {
+       &old_stats_unix_listeners_array[0]
 };
-static buffer_t stats_unix_listeners_buf = {
-       stats_unix_listeners, sizeof(stats_unix_listeners), { NULL, }
+static buffer_t old_stats_unix_listeners_buf = {
+       old_stats_unix_listeners, sizeof(old_stats_unix_listeners), { NULL, }
 };
-static struct file_listener_settings stats_fifo_listeners_array[] = {
-       { "stats-mail", 0600, "", "" },
-       { "stats-user", 0600, "", "" }
+static struct file_listener_settings old_stats_fifo_listeners_array[] = {
+       { "old-stats-mail", 0600, "", "" },
+       { "old-stats-user", 0600, "", "" }
 };
-static struct file_listener_settings *stats_fifo_listeners[] = {
-       &stats_fifo_listeners_array[0],
-       &stats_fifo_listeners_array[1]
+static struct file_listener_settings *old_stats_fifo_listeners[] = {
+       &old_stats_fifo_listeners_array[0],
+       &old_stats_fifo_listeners_array[1]
 };
-static buffer_t stats_fifo_listeners_buf = {
-       stats_fifo_listeners,
-       sizeof(stats_fifo_listeners), { NULL, }
+static buffer_t old_stats_fifo_listeners_buf = {
+       old_stats_fifo_listeners,
+       sizeof(old_stats_fifo_listeners), { NULL, }
 };
 /* </settings checks> */
 
-struct service_settings stats_service_settings = {
-       .name = "stats",
+struct service_settings old_stats_service_settings = {
+       .name = "old-stats",
        .protocol = "",
        .type = "",
        .executable = "stats",
@@ -50,10 +50,10 @@ struct service_settings stats_service_settings = {
        .idle_kill = UINT_MAX,
        .vsz_limit = (uoff_t)-1,
 
-       .unix_listeners = { { &stats_unix_listeners_buf,
-                             sizeof(stats_unix_listeners[0]) } },
-       .fifo_listeners = { { &stats_fifo_listeners_buf,
-                             sizeof(stats_fifo_listeners[0]) } },
+       .unix_listeners = { { &old_stats_unix_listeners_buf,
+                             sizeof(old_stats_unix_listeners[0]) } },
+       .fifo_listeners = { { &old_stats_fifo_listeners_buf,
+                             sizeof(old_stats_fifo_listeners[0]) } },
        .inet_listeners = ARRAY_INIT,
 
        .process_limit_1 = TRUE
@@ -62,9 +62,9 @@ struct service_settings stats_service_settings = {
 /* we're kind of kludging here to avoid "stats_" prefix in the struct fields */
 #undef DEF
 #define DEF(type, name) \
-       { type, "stats_"#name, offsetof(struct stats_settings, name), NULL }
+       { type, "old_stats_"#name, offsetof(struct old_stats_settings, name), NULL }
 
-static const struct setting_define stats_setting_defines[] = {
+static const struct setting_define old_stats_setting_defines[] = {
        DEF(SET_SIZE, memory_limit),
        DEF(SET_TIME, command_min_time),
        DEF(SET_TIME, session_min_time),
@@ -77,7 +77,7 @@ static const struct setting_define stats_setting_defines[] = {
        SETTING_DEFINE_LIST_END
 };
 
-const struct stats_settings stats_default_settings = {
+const struct old_stats_settings old_stats_default_settings = {
        .memory_limit = 1024*1024*16,
 
        .command_min_time = 60,
@@ -91,15 +91,15 @@ const struct stats_settings stats_default_settings = {
        .carbon_name = ""
 };
 
-const struct setting_parser_info stats_setting_parser_info = {
+const struct setting_parser_info old_stats_setting_parser_info = {
        .module_name = "stats",
-       .defines = stats_setting_defines,
-       .defaults = &stats_default_settings,
+       .defines = old_stats_setting_defines,
+       .defaults = &old_stats_default_settings,
 
        .type_offset = (size_t)-1,
-       .struct_size = sizeof(struct stats_settings),
+       .struct_size = sizeof(struct old_stats_settings),
 
        .parent_offset = (size_t)-1
 };
 
-const struct stats_settings *stats_settings;
+const struct old_stats_settings *stats_settings;

diff --git a/src/stats/stats-settings.h b/src/old-stats/stats-settings.h
similarity index 67%
rename from src/stats/stats-settings.h
rename to src/old-stats/stats-settings.h
index f762b63a027f2a1f7a601735e91f002f4170876f..6b50b6485401af1577d1059a24695cdfc100450b 100644 (file)
--- a/src/stats/stats-settings.h
+++ b/src/old-stats/stats-settings.h
@@ -1,7 +1,7 @@
 #ifndef STATS_SETTINGS_H
 #define STATS_SETTINGS_H
 
-struct stats_settings {
+struct old_stats_settings {
        uoff_t memory_limit;
 
        unsigned int command_min_time;
@@ -15,8 +15,8 @@ struct stats_settings {
        const char *carbon_name;
 };
 
-extern const struct setting_parser_info stats_setting_parser_info;
-extern const struct stats_settings *stats_settings;
+extern const struct setting_parser_info old_stats_setting_parser_info;
+extern const struct old_stats_settings *stats_settings;
 
 #endif
 

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 13db030a778cc1e08c03dd9ccf11a92aaa20c934..934e4d566652a60e4db4dd2949efcb1c00fe17b1 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -36,8 +36,8 @@ SUBDIRS = \
        pop3-migration \
        replication \
        snarf \
-       stats \
-       imap-stats \
+       old-stats \
+       imap-old-stats \
        mail-crypt \
        trash \
        virtual \

diff --git a/src/plugins/imap-stats/Makefile.am b/src/plugins/imap-old-stats/Makefile.am
similarity index 55%
rename from src/plugins/imap-stats/Makefile.am
rename to src/plugins/imap-old-stats/Makefile.am
index 64c695c8b966cec9c3728a47cb3b9d59dc34eba2..ed07ed539362bd557a711ca3751e9b66ab5f1a47 100644 (file)
--- a/src/plugins/imap-stats/Makefile.am
+++ b/src/plugins/imap-old-stats/Makefile.am
@@ -1,27 +1,27 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-stats \
+       -I$(top_srcdir)/src/lib-old-stats \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/imap \
-       -I$(top_srcdir)/src/plugins/stats
+       -I$(top_srcdir)/src/plugins/old-stats
 
 imap_moduledir = $(moduledir)
 
 NOPLUGIN_LDFLAGS =
-lib95_imap_stats_plugin_la_LDFLAGS = -module -avoid-version
+lib95_imap_old_stats_plugin_la_LDFLAGS = -module -avoid-version
 
 imap_module_LTLIBRARIES = \
-       lib95_imap_stats_plugin.la
+       lib95_imap_old_stats_plugin.la
 
 if DOVECOT_PLUGIN_DEPS
-lib95_imap_stats_plugin_la_LIBADD = \
-       ../stats/lib90_stats_plugin.la
+lib95_imap_old_stats_plugin_la_LIBADD = \
+       ../old-stats/lib90_old_stats_plugin.la
 endif
 
-lib95_imap_stats_plugin_la_SOURCES = \
+lib95_imap_old_stats_plugin_la_SOURCES = \
        imap-stats-plugin.c
 
 noinst_HEADERS = \

diff --git a/src/plugins/imap-stats/imap-stats-plugin.c b/src/plugins/imap-old-stats/imap-stats-plugin.c
similarity index 100%
rename from src/plugins/imap-stats/imap-stats-plugin.c
rename to src/plugins/imap-old-stats/imap-stats-plugin.c

diff --git a/src/plugins/imap-stats/imap-stats-plugin.h b/src/plugins/imap-old-stats/imap-stats-plugin.h
similarity index 100%
rename from src/plugins/imap-stats/imap-stats-plugin.h
rename to src/plugins/imap-old-stats/imap-stats-plugin.h

diff --git a/src/plugins/old-stats/Makefile.am b/src/plugins/old-stats/Makefile.am
new file mode 100644 (file)
index 0000000..8a95363
--- /dev/null
+++ b/src/plugins/old-stats/Makefile.am
@@ -0,0 +1,33 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-settings \
+       -I$(top_srcdir)/src/lib-mail \
+       -I$(top_srcdir)/src/lib-master \
+       -I$(top_srcdir)/src/lib-old-stats \
+       -I$(top_srcdir)/src/lib-index \
+       -I$(top_srcdir)/src/lib-storage
+
+NOPLUGIN_LDFLAGS =
+lib90_old_stats_plugin_la_LDFLAGS = -module -avoid-version
+
+module_LTLIBRARIES = \
+       lib90_old_stats_plugin.la
+
+lib90_old_stats_plugin_la_SOURCES = \
+       mail-stats.c \
+       mail-stats-fill.c \
+       mail-stats-connection.c \
+       stats-plugin.c
+
+noinst_HEADERS = \
+       mail-stats.h \
+       mail-stats-connection.h \
+       stats-plugin.h
+
+old_stats_moduledir = $(moduledir)/old-stats
+old_stats_module_LTLIBRARIES = libold_stats_mail.la
+
+libold_stats_mail_la_LDFLAGS = -module -avoid-version
+libold_stats_mail_la_LIBADD = mail-stats.lo $(LIBDOVECOT)
+libold_stats_mail_la_DEPENDENCIES = mail-stats.lo
+libold_stats_mail_la_SOURCES =

diff --git a/src/plugins/stats/mail-stats-connection.c b/src/plugins/old-stats/mail-stats-connection.c
similarity index 100%
rename from src/plugins/stats/mail-stats-connection.c
rename to src/plugins/old-stats/mail-stats-connection.c

diff --git a/src/plugins/stats/mail-stats-connection.h b/src/plugins/old-stats/mail-stats-connection.h
similarity index 100%
rename from src/plugins/stats/mail-stats-connection.h
rename to src/plugins/old-stats/mail-stats-connection.h

diff --git a/src/plugins/stats/mail-stats-fill.c b/src/plugins/old-stats/mail-stats-fill.c
similarity index 100%
rename from src/plugins/stats/mail-stats-fill.c
rename to src/plugins/old-stats/mail-stats-fill.c

diff --git a/src/plugins/stats/mail-stats.c b/src/plugins/old-stats/mail-stats.c
similarity index 100%
rename from src/plugins/stats/mail-stats.c
rename to src/plugins/old-stats/mail-stats.c

diff --git a/src/plugins/stats/mail-stats.h b/src/plugins/old-stats/mail-stats.h
similarity index 100%
rename from src/plugins/stats/mail-stats.h
rename to src/plugins/old-stats/mail-stats.h

diff --git a/src/plugins/stats/stats-plugin.c b/src/plugins/old-stats/stats-plugin.c
similarity index 99%
rename from src/plugins/stats/stats-plugin.c
rename to src/plugins/old-stats/stats-plugin.c
index b5c77f893551820a559b2d590fef3dc286701a3a..e8faa82625f21ba9f029a036133beed5ef7df94b 100644 (file)
--- a/src/plugins/stats/stats-plugin.c
+++ b/src/plugins/old-stats/stats-plugin.c
@@ -18,7 +18,7 @@
    Must be smaller than MAIL_SESSION_IDLE_TIMEOUT_MSECS in stats server */
 #define SESSION_STATS_FORCE_REFRESH_SECS (5*60)
 #define REFRESH_CHECK_INTERVAL 100
-#define MAIL_STATS_FIFO_NAME "stats-mail"
+#define MAIL_STATS_FIFO_NAME "old-stats-mail"
 
 struct stats_storage {
        union mail_storage_module_context module_ctx;

diff --git a/src/plugins/stats/stats-plugin.h b/src/plugins/old-stats/stats-plugin.h
similarity index 100%
rename from src/plugins/stats/stats-plugin.h
rename to src/plugins/old-stats/stats-plugin.h

diff --git a/src/plugins/stats/Makefile.am b/src/plugins/stats/Makefile.am
deleted file mode 100644 (file)
index fd7e541..0000000
--- a/src/plugins/stats/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-mail \
-       -I$(top_srcdir)/src/lib-master \
-       -I$(top_srcdir)/src/lib-stats \
-       -I$(top_srcdir)/src/lib-index \
-       -I$(top_srcdir)/src/lib-storage
-
-NOPLUGIN_LDFLAGS =
-lib90_stats_plugin_la_LDFLAGS = -module -avoid-version
-
-module_LTLIBRARIES = \
-       lib90_stats_plugin.la
-
-lib90_stats_plugin_la_SOURCES = \
-       mail-stats.c \
-       mail-stats-fill.c \
-       mail-stats-connection.c \
-       stats-plugin.c
-
-noinst_HEADERS = \
-       mail-stats.h \
-       mail-stats-connection.h \
-       stats-plugin.h
-
-stats_moduledir = $(moduledir)/stats
-stats_module_LTLIBRARIES = libstats_mail.la
-
-libstats_mail_la_LDFLAGS = -module -avoid-version
-libstats_mail_la_LIBADD = mail-stats.lo $(LIBDOVECOT)
-libstats_mail_la_DEPENDENCIES = mail-stats.lo
-libstats_mail_la_SOURCES =