unify Logger interface

cmd/bee/cmd/start.go

@@ -49,7 +49,7 @@ func (c *command) initStartCmd() (err error) {
 				return cmd.Help()
 			}
 
-			logger := logging.New(cmd.OutOrStdout())
+			logger := logging.New(cmd.OutOrStdout()).(*logrus.Logger)
 			switch v := strings.ToLower(c.config.GetString(optionNameVerbosity)); v {
 			case "0", "silent":
 				logger.SetOutput(ioutil.Discard)

pkg/api/api.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/ethersphere/bee/pkg/jsonhttp"
+	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/pingpong"
 	"github.com/prometheus/client_golang/prometheus"
 	"resenje.org/web"
@@ -26,10 +27,7 @@ type server struct {
 
 type Options struct {
 	Pingpong pingpong.Interface
-	Logger   interface {
-		Debugf(format string, args ...interface{})
-		Errorf(format string, args ...interface{})
-	}
+	Logger   logging.Logger
 }
 
 func New(o Options) Service {

pkg/logging/logging.go

@@ -10,11 +10,25 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func New(w io.Writer) *logrus.Logger {
-	logger := logrus.New()
-	logger.SetOutput(w)
-	logger.Formatter = &logrus.TextFormatter{
+type Logger interface {
+	Tracef(format string, args ...interface{})
+	Trace(args ...interface{})
+	Debugf(format string, args ...interface{})
+	Debug(args ...interface{})
+	Infof(format string, args ...interface{})
+	Info(args ...interface{})
+	Warningf(format string, args ...interface{})
+	Warning(args ...interface{})
+	Errorf(format string, args ...interface{})
+	Error(args ...interface{})
+	SetOutput(io.Writer)
+}
+
+func New(w io.Writer) Logger {
+	l := logrus.New()
+	l.SetOutput(w)
+	l.Formatter = &logrus.TextFormatter{
 		FullTimestamp: true,
 	}
-	return logger
+	return l
 }

pkg/p2p/libp2p/internal/handshake/handshake.go

@@ -7,6 +7,7 @@ package handshake
 import (
 	"fmt"
 
+	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/p2p"
 	"github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/pb"
 	"github.com/ethersphere/bee/pkg/p2p/protobuf"
@@ -21,10 +22,10 @@ const (
 type Service struct {
 	overlay   string
 	networkID int32
-	logger    Logger
+	logger    logging.Logger
 }
 
-func New(overlay string, networkID int32, logger Logger) *Service {
+func New(overlay string, networkID int32, logger logging.Logger) *Service {
 	return &Service{
 		overlay:   overlay,
 		networkID: networkID,
@@ -32,10 +33,6 @@ func New(overlay string, networkID int32, logger Logger) *Service {
 	}
 }
 
-type Logger interface {
-	Tracef(format string, args ...interface{})
-}
-
 func (s *Service) Handshake(stream p2p.Stream) (i *Info, err error) {
 	w, r := protobuf.NewWriterAndReader(stream)
 	var resp pb.ShakeHand

pkg/p2p/libp2p/libp2p.go

@@ -17,8 +17,8 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/p2p"
-
 	handshake "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake"
 	"github.com/libp2p/go-libp2p"
 	autonat "github.com/libp2p/go-libp2p-autonat-svc"
@@ -49,7 +49,7 @@ type Service struct {
 	networkID        int32
 	handshakeService *handshake.Service
 	peers            *peerRegistry
-	logger           Logger
+	logger           logging.Logger
 }
 
 type Options struct {
@@ -62,13 +62,7 @@ type Options struct {
 	ConnectionsLow   int
 	ConnectionsHigh  int
 	ConnectionsGrace time.Duration
-	Logger           Logger
-}
-
-type Logger interface {
-	Tracef(format string, args ...interface{})
-	Infof(format string, args ...interface{})
-	Errorf(format string, args ...interface{})
+	Logger           logging.Logger
 }
 
 func New(ctx context.Context, o Options) (*Service, error) {

pkg/pingpong/pingpong.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"time"
 
+	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/p2p"
 	"github.com/ethersphere/bee/pkg/p2p/protobuf"
 	"github.com/ethersphere/bee/pkg/pingpong/pb"
@@ -27,17 +28,13 @@ type Interface interface {
 
 type Service struct {
 	streamer p2p.Streamer
-	logger   Logger
+	logger   logging.Logger
 	metrics  metrics
 }
 
 type Options struct {
 	Streamer p2p.Streamer
-	Logger   Logger
-}
-
-type Logger interface {
-	Debugf(format string, args ...interface{})
+	Logger   logging.Logger
 }
 
 func New(o Options) *Service {