From adcb53041bef60d2e37aa15230f46f2ac1fddc30 Mon Sep 17 00:00:00 2001 From: ilija Date: Thu, 22 May 2025 11:38:29 +0200 Subject: [PATCH 1/2] Improve head listener health report formatting --- chains/heads/listener.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/chains/heads/listener.go b/chains/heads/listener.go index 3b3fe5b..aa0a4d3 100644 --- a/chains/heads/listener.go +++ b/chains/heads/listener.go @@ -133,13 +133,19 @@ func (l *listener[HTH, S, ID, BLOCK_HASH]) Connected() bool { } func (l *listener[HTH, S, ID, BLOCK_HASH]) HealthReport() map[string]error { + receivingHeads := l.ReceivingHeads() + connected := l.Connected() + var err error - if !l.ReceivingHeads() { + switch { + case !connected && !receivingHeads: + err = errors.New("Listener is not connected and is not receiving heads") + case !connected: + err = errors.New("Listener is not connected") + case !receivingHeads: err = errors.New("Listener is not receiving heads") } - if !l.Connected() { - err = errors.Join(err, errors.New("Listener is not connected")) - } + return map[string]error{l.Name(): err} } From a16227b9c9b424b96cdfa1e2da8461ff1b24ea80 Mon Sep 17 00:00:00 2001 From: ilija Date: Thu, 22 May 2025 11:59:06 +0200 Subject: [PATCH 2/2] Improve head listener health report formatting --- chains/heads/listener.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/chains/heads/listener.go b/chains/heads/listener.go index aa0a4d3..e0e20ea 100644 --- a/chains/heads/listener.go +++ b/chains/heads/listener.go @@ -135,15 +135,9 @@ func (l *listener[HTH, S, ID, BLOCK_HASH]) Connected() bool { func (l *listener[HTH, S, ID, BLOCK_HASH]) HealthReport() map[string]error { receivingHeads := l.ReceivingHeads() connected := l.Connected() - var err error - switch { - case !connected && !receivingHeads: - err = errors.New("Listener is not connected and is not receiving heads") - case !connected: - err = errors.New("Listener is not connected") - case !receivingHeads: - err = errors.New("Listener is not receiving heads") + if !receivingHeads || !connected { + err = fmt.Errorf("Listener connected = %t, receiving heads = %t", connected, receivingHeads) } return map[string]error{l.Name(): err}