From 4ba1fd6156874ffd5702ece64added83540399bf Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Fri, 13 Nov 2015 14:52:01 +1100
Subject: [PATCH] Silence dropping of throttled clients

---
 src/stratifier.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/stratifier.c b/src/stratifier.c
index 7927f339..9c83c1d9 100644
--- a/src/stratifier.c
+++ b/src/stratifier.c
@@ -1302,9 +1302,11 @@ static void __drop_client(sdata_t *sdata, stratum_instance_t *client, bool lazil
 
 	if (client->workername) {
 		if (user) {
-			ASPRINTF(msg, "Dropped client %"PRId64" %s %suser %s worker %s %s",
-				 client->id, client->address, user->throttled ? "throttled " : "",
-				 user->username, client->workername, lazily ? "lazily" : "");
+			if (!user->throttled) {
+				ASPRINTF(msg, "Dropped client %"PRId64" %s user %s worker %s %s",
+					 client->id, client->address, user->username,
+					 client->workername, lazily ? "lazily" : "");
+			}
 		} else {
 			ASPRINTF(msg, "Dropped client %"PRId64" %s no user worker %s %s",
 				 client->id, client->address, client->workername,
@@ -1323,7 +1325,7 @@ static void _dec_instance_ref(sdata_t *sdata, stratum_instance_t *client, const
 			      const char *func, const int line)
 {
 	char_entry_t *entries = NULL;
-	char *msg;
+	char *msg = NULL;
 	int ref;
 
 	ck_wlock(&sdata->instance_lock);
@@ -1332,7 +1334,10 @@ static void _dec_instance_ref(sdata_t *sdata, stratum_instance_t *client, const
 	 * moved due to holding a reference and drop them now. */
 	if (unlikely(client->dropped && !ref)) {
 		__drop_client(sdata, client, true, &msg);
-		add_msg_entry(&entries, &msg);
+		/* Make sure there is a message as throttled users don't
+		 * generate a message */
+		if (msg)
+			add_msg_entry(&entries, &msg);
 	}
 	ck_wunlock(&sdata->instance_lock);