From: Timo Sirainen <tss@iki.fi>
Date: Tue, 8 Sep 2009 23:34:49 +0000 (-0400)
Subject: Removed mail_log_max_lines_per_sec setting and related code.
X-Git-Tag: 2.0.alpha1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0740628f6ca05f4bc79a9d8a90b650f4d38d4d0;p=thirdparty%2Fdovecot%2Fcore.git

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.

--HG--
branch : HEAD
---

diff --git a/doc/example-config/conf.d/logging.conf b/doc/example-config/conf.d/logging.conf
index f53a110a65..72bd76fca9 100644
--- a/doc/example-config/conf.d/logging.conf
+++ b/doc/example-config/conf.d/logging.conf
@@ -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 --git a/src/anvil/main.c b/src/anvil/main.c
index 06a6d1268e..57e2de41c5 100644
--- a/src/anvil/main.c
+++ b/src/anvil/main.c
@@ -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 --git a/src/auth/main.c b/src/auth/main.c
index 04f5e5b0c0..64b5ba14fe 100644
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -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 --git a/src/config/main.c b/src/config/main.c
index dd449f3b21..25cda4a1ef 100644
--- a/src/config/main.c
+++ b/src/config/main.c
@@ -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 --git a/src/dict/main.c b/src/dict/main.c
index 5a32e17683..8ca3ba0cdc 100644
--- a/src/dict/main.c
+++ b/src/dict/main.c
@@ -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 --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 749154d89a..6018d03b25 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -134,8 +134,8 @@ master_service_init(const char *name, enum master_service_flags flags,
 	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 --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h
index 0a313b93bb..7a88bf223a 100644
--- a/src/lib-master/master-service.h
+++ b/src/lib-master/master-service.h
@@ -49,8 +49,8 @@ void master_service_init_finish(struct master_service *service);
 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 --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 714fe69393..5d1c346e54 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -469,8 +469,7 @@ mail_storage_service_init_log(struct master_service *service,
 		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 master_service *service,
 
 	/* 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 --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 0c3e74f668..02c8f433c1 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -146,7 +146,6 @@ static struct setting_define mail_user_setting_defines[] = {
 	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 @@ static struct mail_user_settings mail_user_default_settings = {
 	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 --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index f64ffcf3cd..01b8fd83bb 100644
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -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 --git a/src/log/main.c b/src/log/main.c
index 5575d6acbb..d1abb609bc 100644
--- a/src/log/main.c
+++ b/src/log/main.c
@@ -15,7 +15,7 @@ pid_t master_pid;
 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 --git a/src/login-common/main.c b/src/login-common/main.c
index d27fdbfec9..85972110fb 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -163,7 +163,7 @@ int main(int argc, char *argv[], char *envp[])
 					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 --git a/src/master/main.c b/src/master/main.c
index 7a9d505fb4..fd55a7d968 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -378,7 +378,7 @@ sig_log_reopen(const siginfo_t *si ATTR_UNUSED, void *context ATTR_UNUSED)
 {
         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 --git a/src/plugins/convert/convert-tool.c b/src/plugins/convert/convert-tool.c
index 02168efb05..c8ae5548fc 100644
--- a/src/plugins/convert/convert-tool.c
+++ b/src/plugins/convert/convert-tool.c
@@ -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));