From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 30 May 2018 11:55:19 +0000 (+0300)
Subject: doveadm service status: Show total number of processes created
X-Git-Tag: 2.3.9~1606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf76551ea7bc485a9a6ff80a27fcb7f301f47669;p=thirdparty%2Fdovecot%2Fcore.git

doveadm service status: Show total number of processes created
---

diff --git a/src/doveadm/doveadm-master.c b/src/doveadm/doveadm-master.c
index 7ce8e183e0..2fc0190a38 100644
--- a/src/doveadm/doveadm-master.c
+++ b/src/doveadm/doveadm-master.c
@@ -172,6 +172,7 @@ static void cmd_service_status(struct doveadm_cmd_context *cctx)
 	doveadm_print_header_simple("listen_pending");
 	doveadm_print_header_simple("listening");
 	doveadm_print_header_simple("doveadm_stop");
+	doveadm_print_header_simple("process_total");
 	fields_count = doveadm_print_get_headers_count();
 
 	alarm(5);
diff --git a/src/master/master-client.c b/src/master/master-client.c
index 74ed4fd28d..5525ee09ba 100644
--- a/src/master/master-client.c
+++ b/src/master/master-client.c
@@ -20,7 +20,7 @@ master_client_service_status_output(string_t *str,
 				    const struct service *service)
 {
 	str_append_tabescaped(str, service->set->name);
-	str_printfa(str, "\t%u\t%u\t%u\t%u\t%u\t%ld\t%u\t%ld\t%c\t%c\t%c\n",
+	str_printfa(str, "\t%u\t%u\t%u\t%u\t%u\t%ld\t%u\t%ld\t%c\t%c\t%c\t%"PRIu64"\n",
 		    service->process_count, service->process_avail,
 		    service->process_limit, service->client_limit,
 		    service->to_throttle == NULL ? 0 : service->throttle_secs,
@@ -29,7 +29,8 @@ master_client_service_status_output(string_t *str,
 		    (long)service->last_drop_warning,
 		    service->listen_pending ? 'y' : 'n',
 		    service->listening ? 'y' : 'n',
-		    service->doveadm_stop ? 'y' : 'n');
+		    service->doveadm_stop ? 'y' : 'n',
+		    service->process_count_total);
 }
 
 static int