historyarchive: Make the library target the same log as Horizon (#5178)

* Change logging provider to Horizon's default rather than logrus
stellar · Jan 23, 2024 · 0ddb36f · 0ddb36f
1 parent a8b5c8e
commit 0ddb36f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/historyarchive/archive_cache.go b/historyarchive/archive_cache.go
@@ -6,14 +6,15 @@ import (
 	"path"
 
 	lru "github.com/hashicorp/golang-lru"
-	log "github.com/sirupsen/logrus"
+	log "github.com/stellar/go/support/log"
 )
 
 type CacheOptions struct {
 	Cache bool
 
 	Path     string
 	MaxFiles uint
+	Log      *log.Entry
 }
 
 type ArchiveBucketCache struct {
@@ -25,8 +26,11 @@ type ArchiveBucketCache struct {
 // MakeArchiveBucketCache creates a cache on the disk at the given path that
 // acts as an LRU cache, mimicking a particular upstream.
 func MakeArchiveBucketCache(opts CacheOptions) (*ArchiveBucketCache, error) {
-	log_ := log.
-		WithField("subservice", "fs-cache").
+	log_ := opts.Log
+	if opts.Log == nil {
+		log_ = log.WithField("subservice", "fs-cache")
+	}
+	log_ = log_.
 		WithField("path", opts.Path).
 		WithField("cap", opts.MaxFiles)
 

diff --git a/services/horizon/internal/ingest/main.go b/services/horizon/internal/ingest/main.go
@@ -230,6 +230,7 @@ func NewSystem(config Config) (System, error) {
 			CacheConfig: historyarchive.CacheOptions{
 				Cache:    true,
 				Path:     path.Join(config.CaptiveCoreStoragePath, "bucket-cache"),
+				Log:      log.WithField("subservice", "ha-cache"),
 				MaxFiles: 150,
 			},
 		},

diff --git a/support/log/entry.go b/support/log/entry.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 
 	gerr "github.com/go-errors/errors"
 	"github.com/sirupsen/logrus"
@@ -198,7 +197,7 @@ func (e *Entry) StartTest(level logrus.Level) func() []logrus.Entry {
 	e.entry.Logger.AddHook(hook)
 
 	old := e.entry.Logger.Out
-	e.entry.Logger.Out = ioutil.Discard
+	e.entry.Logger.Out = io.Discard
 
 	oldLevel := e.entry.Logger.GetLevel()
 	e.entry.Logger.SetLevel(level)