From: Timo Sirainen <tss@iki.fi>
Date: Wed, 18 Jan 2012 12:21:53 +0000 (+0200)
Subject: master: Show the process_limit / client_limit value when logging that it's been reached.
X-Git-Tag: 2.1.rc4~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a79fdaf3253dae045dfa14d2a88b94086327da4;p=thirdparty%2Fdovecot%2Fcore.git

master: Show the process_limit / client_limit value when logging that it's been reached.
---

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index 814862f7b7..a79cabe4ec 100644
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -231,16 +231,19 @@ static void service_monitor_listen_pending(struct service *service)
 static void service_drop_connections(struct service_listener *l)
 {
 	struct service *service = l->service;
+	unsigned int limit;
 	int fd;
 
 	if (service->last_drop_warning +
 	    SERVICE_DROP_WARN_INTERVAL_SECS < ioloop_time) {
 		service->last_drop_warning = ioloop_time;
-		i_warning("service(%s): %s reached, "
+		limit = service->process_limit > 1 ?
+			service->process_limit : service->client_limit;
+		i_warning("service(%s): %s (%u) reached, "
 			  "client connections are being dropped",
 			  service->set->name,
 			  service->process_limit > 1 ?
-			  "process_limit" : "client_limit");
+			  "process_limit" : "client_limit", limit);
 	}
 
 	if (service->type == SERVICE_TYPE_LOGIN) {