Refactor the peekDeadLetter and support pass with the context

Author: Joker-hh

client/client.go

@@ -179,53 +179,9 @@ func (c *LmstfyClient) PeekJob(queue, jobID string) (job *Job, e *APIError) {
 	return c.peekJob(nil, queue, jobID)
 }
 
-// Peek the deadletter of the queue
+// PeekDeadLetter Peeks the dead letter of the queue
 func (c *LmstfyClient) PeekDeadLetter(queue string) (deadLetterSize int, deadLetterHead string, e *APIError) {
-	req, err := c.getReq(http.MethodGet, path.Join(queue, "deadletter"), nil, nil)
-	if err != nil {
-		return 0, "", &APIError{
-			Type:   RequestErr,
-			Reason: err.Error(),
-		}
-	}
-	resp, err := c.httpCli.Do(req)
-	if err != nil {
-		return 0, "", &APIError{
-			Type:   RequestErr,
-			Reason: err.Error(),
-		}
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return 0, "", &APIError{
-			Type:      ResponseErr,
-			Reason:    parseResponseError(resp),
-			RequestID: resp.Header.Get("X-Request-ID"),
-		}
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return 0, "", &APIError{
-			Type:      ResponseErr,
-			Reason:    err.Error(),
-			RequestID: resp.Header.Get("X-Request-ID"),
-		}
-	}
-	var respData struct {
-		Namespace      string `json:"namespace"`
-		Queue          string `json:"queue"`
-		DeadLetterSize int    `json:"deadletter_size"`
-		DeadLetterHead string `json:"deadletter_head"`
-	}
-	err = json.Unmarshal(respBytes, &respData)
-	if err != nil {
-		return 0, "", &APIError{
-			Type:      ResponseErr,
-			Reason:    err.Error(),
-			RequestID: resp.Header.Get("X-Request-ID"),
-		}
-	}
-	return respData.DeadLetterSize, respData.DeadLetterHead, nil
+	return c.peekDeadLetter(nil, queue)
 }
 
 func (c *LmstfyClient) RespawnDeadLetter(queue string, limit, ttlSecond int64) (count int, e *APIError) {

client/client_impl.go

@@ -642,6 +642,56 @@ func (c *LmstfyClient) peekJob(ctx context.Context, queue, jobID string) (job *J
 	return job, nil
 }
 
+// peekDeadLetter Peek the dead letter of the queue
+func (c *LmstfyClient) peekDeadLetter(ctx context.Context, queue string) (
+	deadLetterSize int, deadLetterHead string, e *APIError) {
+	req, err := c.getReq(ctx, http.MethodGet, path.Join(queue, "deadletter"), nil, nil)
+	if err != nil {
+		return 0, "", &APIError{
+			Type:   RequestErr,
+			Reason: err.Error(),
+		}
+	}
+	resp, err := c.httpCli.Do(req)
+	if err != nil {
+		return 0, "", &APIError{
+			Type:   RequestErr,
+			Reason: err.Error(),
+		}
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return 0, "", &APIError{
+			Type:      ResponseErr,
+			Reason:    parseResponseError(resp),
+			RequestID: resp.Header.Get("X-Request-ID"),
+		}
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return 0, "", &APIError{
+			Type:      ResponseErr,
+			Reason:    err.Error(),
+			RequestID: resp.Header.Get("X-Request-ID"),
+		}
+	}
+	var respData struct {
+		Namespace      string `json:"namespace"`
+		Queue          string `json:"queue"`
+		DeadLetterSize int    `json:"deadletter_size"`
+		DeadLetterHead string `json:"deadletter_head"`
+	}
+	err = json.Unmarshal(respBytes, &respData)
+	if err != nil {
+		return 0, "", &APIError{
+			Type:      ResponseErr,
+			Reason:    err.Error(),
+			RequestID: resp.Header.Get("X-Request-ID"),
+		}
+	}
+	return respData.DeadLetterSize, respData.DeadLetterHead, nil
+}
+
 func discardResponseBody(resp io.ReadCloser) {
 	// discard response body, to make this connection reusable in the http connection pool
 	_, _ = ioutil.ReadAll(resp)