make 'polling client watch failed' errors more detailed (#794)

* make 'polling client watch failed' errors more detailed fix #793 * fix loop in http client json marshal
drand · Apr 14, 2021 · 60b060c · 60b060c
1 parent ec4f8f9
commit 60b060c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/client/http/http.go b/client/http/http.go
@@ -169,6 +169,11 @@ func (h *httpClient) String() string {
 	return fmt.Sprintf("HTTP(%q)", h.root)
 }
 
+// Implement textMarshaller
+func (h *httpClient) MarshalText() ([]byte, error) {
+	return json.Marshal(h.String())
+}
+
 type httpInfoResponse struct {
 	chainInfo *chain.Info
 	err       error
@@ -234,11 +239,6 @@ func (h *httpClient) FetchChainInfo(chainHash []byte) (*chain.Info, error) {
 	}
 }
 
-// Implement textMarshaller
-func (h *httpClient) MarshalText() ([]byte, error) {
-	return json.Marshal(h)
-}
-
 type httpGetResponse struct {
 	result client.Result
 	err    error

diff --git a/client/poll.go b/client/poll.go
@@ -15,7 +15,7 @@ func PollingWatcher(ctx context.Context, c Client, chainInfo *chain.Info, l log.
 	r := c.RoundAt(time.Now())
 	val, err := c.Get(ctx, r)
 	if err != nil {
-		l.Error("polling_client", "failed to watch", "err", err)
+		l.Error("polling_client", "failed synchronous get", "from", c, "err", err)
 		close(ch)
 		return ch
 	}
@@ -36,7 +36,7 @@ func PollingWatcher(ctx context.Context, c Client, chainInfo *chain.Info, l log.
 		if err == nil {
 			ch <- r
 		} else {
-			l.Error("polling_client", "failed to watch", "err", err)
+			l.Error("polling_client", "failed first async get", "from", c, "err", err)
 		}
 
 		// Then tick each period.
@@ -49,7 +49,7 @@ func PollingWatcher(ctx context.Context, c Client, chainInfo *chain.Info, l log.
 				if err == nil {
 					ch <- r
 				} else {
-					l.Error("polling_client", "failed to watch", "err", err)
+					l.Error("polling_client", "failed subsequent watch poll", "from", c, "err", err)
 				}
 				// TODO: keep trying on errors?
 			case <-ctx.Done():