Fix rebase conflicts

ChainSafe · Nov 15, 2021 · dc359bc · dc359bc
1 parent bd7c87e
commit dc359bc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 59 deletions.
diff --git a/dot/services.go b/dot/services.go
@@ -19,6 +19,7 @@ import (
 	"github.com/ChainSafe/gossamer/dot/sync"
 	"github.com/ChainSafe/gossamer/dot/system"
 	"github.com/ChainSafe/gossamer/dot/types"
+	"github.com/ChainSafe/gossamer/internal/log"
 	"github.com/ChainSafe/gossamer/internal/pprof"
 	"github.com/ChainSafe/gossamer/lib/babe"
 	"github.com/ChainSafe/gossamer/lib/common"
@@ -31,7 +32,6 @@ import (
 	"github.com/ChainSafe/gossamer/lib/runtime/life"
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/lib/utils"
-	log "github.com/ChainSafe/log15"
 )
 
 func newInMemoryDB(path string) (chaindb.Database, error) {
@@ -413,6 +413,6 @@ func createDigestHandler(st *state.Service) (*digest.Handler, error) {
 }
 
 func createPprofService(settings pprof.Settings) (service *pprof.Service) {
-	pprofLogger := log.New("pkg", "pprof")
+	pprofLogger := log.NewFromGlobal(log.AddContext("pkg", "pprof"))
 	return pprof.NewService(settings, pprofLogger)
 }
diff --git a/internal/httpserver/logger.go b/internal/httpserver/logger.go
@@ -3,7 +3,7 @@ package httpserver
 // Logger is the logger interface accepted by the
 // HTTP server.
 type Logger interface {
-	Info(msg string, ctx ...interface{})
-	Warn(msg string, ctx ...interface{})
-	Error(msg string, ctx ...interface{})
+	Info(msg string)
+	Warn(msg string)
+	Error(msg string)
 }
diff --git a/internal/httpserver/logger_mock_test.go b/internal/httpserver/logger_mock_test.go
diff --git a/internal/pprof/logger_mock_test.go b/internal/pprof/logger_mock_test.go