dovecot-2.0: Removed mail_log_max_lines_per_sec setting and rela...
dovecot at dovecot.org
dovecot at dovecot.org
Wed Sep 9 02:34:58 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/37bc3a3d4464
changeset: 9912:37bc3a3d4464
user: Timo Sirainen <tss at iki.fi>
date: Tue Sep 08 19:34:49 2009 -0400
description:
Removed mail_log_max_lines_per_sec setting and related code.
It's pretty unnecessary and there's really no good way to implement it with
shared log pipes.
diffstat:
14 files changed, 16 insertions(+), 29 deletions(-)
doc/example-config/conf.d/logging.conf | 6 ------
src/anvil/main.c | 2 +-
src/auth/main.c | 2 +-
src/config/main.c | 2 +-
src/dict/main.c | 2 +-
src/lib-master/master-service.c | 4 ++--
src/lib-master/master-service.h | 4 ++--
src/lib-storage/mail-storage-service.c | 6 ++----
src/lib-storage/mail-storage-settings.c | 3 ---
src/lib-storage/mail-storage-settings.h | 2 --
src/log/main.c | 4 ++--
src/login-common/main.c | 2 +-
src/master/main.c | 4 ++--
src/plugins/convert/convert-tool.c | 2 +-
diffs (213 lines):
diff -r d7bbe0964b0d -r 37bc3a3d4464 doc/example-config/conf.d/logging.conf
--- a/doc/example-config/conf.d/logging.conf Tue Sep 08 19:29:54 2009 -0400
+++ b/doc/example-config/conf.d/logging.conf Tue Sep 08 19:34:49 2009 -0400
@@ -48,12 +48,6 @@ plugin {
#mail_log_fields = uid box msgid size
}
-# Max. number of lines a mail process is allowed to log per second before it's
-# throttled. 0 means unlimited. Typically there's no need to change this
-# unless you're using mail_log plugin, which may log a lot. This setting is
-# ignored while mail_debug=yes to avoid pointless throttling.
-#mail_log_max_lines_per_sec = 10
-
##
## Log formatting.
##
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/anvil/main.c
--- a/src/anvil/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/anvil/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
}
master_service_set_die_with_master(master_service, TRUE);
- master_service_init_log(master_service, "anvil: ", 0);
+ master_service_init_log(master_service, "anvil: ");
master_service_init_finish(master_service);
connect_limit = connect_limit_init();
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/auth/main.c
--- a/src/auth/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/auth/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
int c;
master_service = master_service_init("auth", 0, argc, argv);
- master_service_init_log(master_service, "auth: ", 0);
+ master_service_init_log(master_service, "auth: ");
getopt_str = t_strconcat("w", master_service_getopt_string(), NULL);
while ((c = getopt(argc, argv, getopt_str)) > 0) {
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/config/main.c
--- a/src/config/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/config/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
exit(FATAL_DEFAULT);
}
- master_service_init_log(master_service, "config: ", 0);
+ master_service_init_log(master_service, "config: ");
master_service_init_finish(master_service);
path = master_service_get_config_path(master_service);
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/dict/main.c
--- a/src/dict/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/dict/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
&error) < 0)
i_fatal("Error reading configuration: %s", error);
- master_service_init_log(master_service, "dict: ", 0);
+ master_service_init_log(master_service, "dict: ");
main_preinit();
master_service_init_finish(master_service);
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/lib-master/master-service.c
--- a/src/lib-master/master-service.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/lib-master/master-service.c Tue Sep 08 19:34:49 2009 -0400
@@ -134,8 +134,8 @@ master_service_init(const char *name, en
return service;
}
-void master_service_init_log(struct master_service *service, const char *prefix,
- unsigned int max_lines_per_sec)
+void master_service_init_log(struct master_service *service,
+ const char *prefix)
{
const char *path;
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/lib-master/master-service.h
--- a/src/lib-master/master-service.h Tue Sep 08 19:29:54 2009 -0400
+++ b/src/lib-master/master-service.h Tue Sep 08 19:34:49 2009 -0400
@@ -49,8 +49,8 @@ void master_service_env_clean(bool prese
void master_service_env_clean(bool preserve_home);
/* Initialize logging. */
-void master_service_init_log(struct master_service *service, const char *prefix,
- unsigned int max_lines_per_sec);
+void master_service_init_log(struct master_service *service,
+ const char *prefix);
/* If set, die immediately when connection to master is lost.
Normally all existing clients are handled first. */
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/lib-storage/mail-storage-service.c Tue Sep 08 19:34:49 2009 -0400
@@ -469,8 +469,7 @@ mail_storage_service_init_log(struct mas
str = t_str_new(256);
var_expand(str, user_set->mail_log_prefix,
get_var_expand_table(service, input));
- master_service_init_log(service, str_c(str),
- user_set->mail_log_max_lines_per_sec);
+ master_service_init_log(service, str_c(str));
} T_END;
}
@@ -650,8 +649,7 @@ mail_storage_service_multi_init(struct m
/* do all the global initialization. delay initializing plugins until
we drop privileges the first time. */
- master_service_init_log(service, t_strconcat(service->name, ": ", NULL),
- user_set->mail_log_max_lines_per_sec);
+ master_service_init_log(service, t_strconcat(service->name, ": ", NULL));
modules = *user_set->mail_plugins == '\0' ? NULL :
module_dir_load(user_set->mail_plugin_dir,
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/lib-storage/mail-storage-settings.c Tue Sep 08 19:34:49 2009 -0400
@@ -146,7 +146,6 @@ static struct setting_define mail_user_s
DEF(SET_UINT, last_valid_uid),
DEF(SET_UINT, first_valid_gid),
DEF(SET_UINT, last_valid_gid),
- DEF(SET_UINT, mail_log_max_lines_per_sec),
DEF(SET_STR, mail_plugins),
DEF(SET_STR, mail_plugin_dir),
@@ -175,8 +174,6 @@ static struct mail_user_settings mail_us
MEMBER(last_valid_uid) 0,
MEMBER(first_valid_gid) 1,
MEMBER(last_valid_gid) 0,
-
- MEMBER(mail_log_max_lines_per_sec) 10,
MEMBER(mail_plugins) "",
MEMBER(mail_plugin_dir) MODULEDIR,
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/lib-storage/mail-storage-settings.h
--- a/src/lib-storage/mail-storage-settings.h Tue Sep 08 19:29:54 2009 -0400
+++ b/src/lib-storage/mail-storage-settings.h Tue Sep 08 19:34:49 2009 -0400
@@ -58,8 +58,6 @@ struct mail_user_settings {
unsigned int first_valid_uid, last_valid_uid;
unsigned int first_valid_gid, last_valid_gid;
- unsigned int mail_log_max_lines_per_sec;
-
const char *mail_plugins;
const char *mail_plugin_dir;
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/log/main.c
--- a/src/log/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/log/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -15,7 +15,7 @@ static void
static void
sig_reopen_logs(const siginfo_t *si ATTR_UNUSED, void *context ATTR_UNUSED)
{
- master_service_init_log(master_service, "log: ", 0);
+ master_service_init_log(master_service, "log: ");
}
static void main_init(void)
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
NULL, &error) < 0)
i_fatal("Error reading configuration: %s", error);
- master_service_init_log(master_service, "log: ", 0);
+ master_service_init_log(master_service, "log: ");
master_service_init_finish(master_service);
main_init();
master_service_run(master_service, client_connected);
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/login-common/main.c
--- a/src/login-common/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/login-common/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -163,7 +163,7 @@ int main(int argc, char *argv[], char *e
MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN,
argc, argv);
master_service_init_log(master_service, t_strconcat(
- login_process_name, ": ", NULL), 0);
+ login_process_name, ": ", NULL));
getopt_str = t_strconcat("DS", master_service_getopt_string(), NULL);
while ((c = getopt(argc, argv, getopt_str)) > 0) {
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/master/main.c
--- a/src/master/main.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/master/main.c Tue Sep 08 19:34:49 2009 -0400
@@ -378,7 +378,7 @@ sig_log_reopen(const siginfo_t *si ATTR_
{
service_signal(services->log, SIGUSR1);
- master_service_init_log(master_service, "dovecot: ", 0);
+ master_service_init_log(master_service, "dovecot: ");
i_set_fatal_handler(master_fatal_callback);
}
@@ -724,7 +724,7 @@ int main(int argc, char *argv[])
if (send_signal != 0)
send_master_signal(send_signal);
- master_service_init_log(master_service, "dovecot: ", 0);
+ master_service_init_log(master_service, "dovecot: ");
i_get_failure_handlers(&orig_fatal_callback, &orig_error_callback,
&orig_info_callback);
i_set_fatal_handler(startup_fatal_handler);
diff -r d7bbe0964b0d -r 37bc3a3d4464 src/plugins/convert/convert-tool.c
--- a/src/plugins/convert/convert-tool.c Tue Sep 08 19:29:54 2009 -0400
+++ b/src/plugins/convert/convert-tool.c Tue Sep 08 19:34:49 2009 -0400
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
input.username = argv[optind];
master_service_init_log(master_service,
- t_strdup_printf("convert-tool(%s): ", input.username), 0);
+ t_strdup_printf("convert-tool(%s): ", input.username));
user = mail_storage_service_init_user(master_service, &input, NULL, 0);
memset(&ns_set, 0, sizeof(ns_set));
More information about the dovecot-cvs
mailing list