Mercurial > dovecot > core-2.2
changeset 9912:37bc3a3d4464 HEAD
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.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 08 Sep 2009 19:34:49 -0400 |
| parents | d7bbe0964b0d |
| children | e819f6dfe5f4 |
| files | doc/example-config/conf.d/logging.conf src/anvil/main.c src/auth/main.c src/config/main.c src/dict/main.c src/lib-master/master-service.c src/lib-master/master-service.h src/lib-storage/mail-storage-service.c src/lib-storage/mail-storage-settings.c src/lib-storage/mail-storage-settings.h src/log/main.c src/login-common/main.c src/master/main.c src/plugins/convert/convert-tool.c |
| diffstat | 14 files changed, 16 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ #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. ##
--- 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 @@ } 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();
--- 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 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) {
--- 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 @@ 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);
--- 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 @@ &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);
--- 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 @@ 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;
--- 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 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. */
--- 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 @@ 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 @@ /* 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,
--- 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 @@ 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), @@ -176,8 +175,6 @@ 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,
--- 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 @@ 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;
--- 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 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 @@ 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);
--- 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 @@ 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) {
--- 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 @@ { 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 @@ 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);
--- 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 @@ 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));