From 19ed6c4344f416c17c644f3c95373b6b9efb4bbf Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 21 Feb 2022 15:29:45 +0400 Subject: [PATCH] remove the log/tail command This causes go-ipfs tests to fail when upgrading to a libp2p version that doesn't use go-log@v1 any more. --- logger.go | 41 ----------------------------------------- logger_test.go | 26 -------------------------- 2 files changed, 67 deletions(-) delete mode 100644 logger.go delete mode 100644 logger_test.go diff --git a/logger.go b/logger.go deleted file mode 100644 index bdb7e64bc..000000000 --- a/logger.go +++ /dev/null @@ -1,41 +0,0 @@ -package shell - -import ( - "context" - "encoding/json" - "io" -) - -// Logger is used to handle incoming logs from the ipfs node -type Logger struct { - 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{} - return out, l.dec.Decode(&out) -} - -// Close is used to close our reader -func (l Logger) Close() error { - return l.resp.Close() -} - -// GetLogs is used to retrieve a parsable logger object -func (s *Shell) GetLogs(ctx context.Context) (Logger, error) { - resp, err := s.Request("log/tail").Send(ctx) - if err != nil { - return Logger{}, err - } - if resp.Error != nil { - resp.Output.Close() - return Logger{}, resp.Error - } - return newLogger(resp.Output), nil -} - -func newLogger(resp io.ReadCloser) Logger { - return Logger{resp, json.NewDecoder(resp)} -} diff --git a/logger_test.go b/logger_test.go deleted file mode 100644 index 28250efd1..000000000 --- a/logger_test.go +++ /dev/null @@ -1,26 +0,0 @@ -package shell - -import ( - "context" - "testing" -) - -func TestLogger(t *testing.T) { - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - sh := NewShell(shellUrl) - logger, err := sh.GetLogs(ctx) - if err != nil { - t.Fatal(err) - } - defer func() { - if err := logger.Close(); err != nil { - t.Fatal(err) - } - }() - if l, err := logger.Next(); err != nil { - t.Fatal(err) - } else if l == nil { - t.Fatal("no logs found") - } -}