log: fix logging

Author: postables

log.go

@@ -1,42 +1,41 @@
 package shell
 
 import (
+	"context"
 	"encoding/json"
-	"fmt"
 	"io"
-	"net/http"
 )
 
 // Logger is used to handle incoming logs from the ipfs node
 type Logger struct {
-	r io.ReadCloser
+	resp io.ReadCloser
+	dec  *json.Decoder
 }
 
 // Next is used to retrieve the next event from the logging system
 func (l Logger) Next() (map[string]interface{}, error) {
 	var out map[string]interface{}
-	if err := json.NewDecoder(l.r).Decode(&out); err != nil {
-		return nil, err
-	}
-	return out, nil
+	return out, l.dec.Decode(&out)
 }
 
 // Close is used to close our reader
 func (l Logger) Close() error {
-	return l.r.Close()
+	return l.resp.Close()
 }
 
 // GetLogs is used to retrieve a parsable logger object
-func (s *Shell) GetLogs() (Logger, error) {
-	logURL := fmt.Sprintf("http://%s/api/v0/log/tail", s.url)
-	req, err := http.NewRequest("GET", logURL, nil)
+func (s *Shell) GetLogs(ctx context.Context) (Logger, error) {
+	resp, err := s.Request("log/tail").Send(ctx)
 	if err != nil {
 		return Logger{}, err
 	}
-	hc := &http.Client{}
-	resp, err := hc.Do(req)
-	if err != nil {
-		return Logger{}, err
+	if resp.Error != nil {
+		resp.Output.Close()
+		return Logger{}, resp.Error
 	}
-	return Logger{resp.Body}, nil
+	return newLogger(resp.Output), nil
+}
+
+func newLogger(resp io.ReadCloser) Logger {
+	return Logger{resp, json.NewDecoder(resp)}
 }

log_test.go

@@ -1,10 +1,15 @@
 package shell
 
-import "testing"
+import (
+	"context"
+	"testing"
+)
 
 func Test_Logger(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	sh := NewLocalShell()
-	logger, err := sh.GetLogs()
+	logger, err := sh.GetLogs(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}