From 8318e9040180282c8aeef14d15c0ad1c071f17d6 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <github@flamingcow.io>
Date: Sun, 18 Jun 2023 08:18:33 -0700
Subject: [PATCH] Include IDs with events, ignore blank votes

---
 candidate.go | 12 +++++++++++-
 voter.go     |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/candidate.go b/candidate.go
index b4b3722..a139f4d 100644
--- a/candidate.go
+++ b/candidate.go
@@ -250,9 +250,18 @@ func (c *Candidate) elect(ctx context.Context, ec *event.Client, v *vote) {
 			continue
 		}
 
-		if vote.LastSeenCandidateID != c.resp.CandidateID {
+		if vote.LastSeenCandidateID != "" && vote.LastSeenCandidateID != c.resp.CandidateID {
 			// Hard no; voted for someone else
 			no++
+
+			if c.state == StateLeader {
+				c.log(ctx, ec,
+					"event", "noVoteWhileLeader",
+					"voterID", vote.VoterID,
+					"otherCandidateID", vote.LastSeenCandidateID,
+					"numPollsSincechange", vote.NumPollsSinceChange,
+				)
+			}
 		}
 
 		if vote.NumPollsSinceChange < 10 {
@@ -316,6 +325,7 @@ func (c *Candidate) log(ctx context.Context, ec *event.Client, vals ...any) {
 	ec.Log(ctx, append([]any{
 		"library", "elect",
 		"subsystem", "candidate",
+		"candidateID", c.resp.CandidateID,
 	}, vals...)...)
 }
 
diff --git a/voter.go b/voter.go
index 51cc4fb..118876e 100644
--- a/voter.go
+++ b/voter.go
@@ -198,5 +198,6 @@ func (v *Voter) log(ctx context.Context, ec *event.Client, vals ...any) {
 	ec.Log(ctx, append([]any{
 		"library", "elect",
 		"subsystem", "voter",
+		"voterID", v.vote.VoterID,
 	}, vals...)...)
 }