director: Log user's kill_state with a human-readable string.

dovecot · Oct 25, 2016 · 825dc91 · 825dc91
1 parent 283aea2
commit 825dc91
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/director/director-connection.c b/src/director/director-connection.c
@@ -572,8 +572,10 @@ director_user_refresh(struct director_connection *conn,
 		}
 		if (user->to_move != NULL)
 			str_append(str, ",moving");
-		if (user->kill_state != USER_KILL_STATE_NONE)
-			str_printfa(str, ",kill_state=%d", user->kill_state);
+		if (user->kill_state != USER_KILL_STATE_NONE) {
+			str_printfa(str, ",kill_state=%s",
+				    user_kill_state_names[user->kill_state]);
+		}
 		str_append_c(str, ')');
 		i_error("%s", str_c(str));
 

diff --git a/src/director/user-directory.c b/src/director/user-directory.c
@@ -36,6 +36,15 @@ struct user_directory {
 	unsigned int user_near_expiring_secs;
 };
 
+const char *user_kill_state_names[USER_KILL_STATE_DELAY+1] = {
+	"none",
+	"killing",
+	"notify-received",
+	"waiting-for-notify",
+	"waiting-for-everyone",
+	"delay",
+};
+
 static void user_move_iters(struct user_directory *dir, struct user *user)
 {
 	struct user_directory_iter *const *iterp;

diff --git a/src/director/user-directory.h b/src/director/user-directory.h
@@ -21,7 +21,9 @@ enum user_kill_state {
 	   the user move (although it could be earlier if we added a new
 	   USER-MOVED notification). */
 	USER_KILL_STATE_DELAY
+	/* NOTE: remember to update also user_kill_state_names[] */
 };
+extern const char *user_kill_state_names[USER_KILL_STATE_DELAY+1];
 
 struct user {
 	/* sorted by time */