15112: Use FieldLogger interface so tests can use ctxlog.TestLogger.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/services/keep-balance/balance.go b/services/keep-balance/balance.go
index 9e8ca3a672dab68ad7f783912096a16bc675db17..f47a99761f2045057dfb9775ac51d44499f0bc39 100644 (file)
--- a/services/keep-balance/balance.go
+++ b/services/keep-balance/balance.go
@@ -31,8 +31,8 @@ import (
 // BlobSignatureTTL; and all N existing replicas of a given data block
 // are in the N best positions in rendezvous probe order.
 type Balancer struct {
-       Logger  *logrus.Logger
-       Dumper  *logrus.Logger
+       Logger  logrus.FieldLogger
+       Dumper  logrus.FieldLogger
        Metrics *metrics
 
        *BlockStateMap

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index 3316a17240cddd69c37aa804e9bd5e2dbf610def..84516a821060da1b795da1b40655a9a62157fd52 100644 (file)
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -76,9 +76,10 @@ func main() {
                }
        }
        if *dumpFlag {
-               runOptions.Dumper = logrus.New()
-               runOptions.Dumper.Out = os.Stdout
-               runOptions.Dumper.Formatter = &logrus.TextFormatter{}
+               dumper := logrus.New()
+               dumper.Out = os.Stdout
+               dumper.Formatter = &logrus.TextFormatter{}
+               runOptions.Dumper = dumper
        }
        srv, err := NewServer(cfg, runOptions)
        if err != nil {

diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go
index 613a2f7d3c3da2e6c466ec8ac9345a9e2e70775e..c867d7b10de240d7a584c258c9cc19aa0dfe3922 100644 (file)
--- a/services/keep-balance/server.go
+++ b/services/keep-balance/server.go
@@ -70,8 +70,8 @@ type RunOptions struct {
        Once        bool
        CommitPulls bool
        CommitTrash bool
-       Logger      *logrus.Logger
-       Dumper      *logrus.Logger
+       Logger      logrus.FieldLogger
+       Dumper      logrus.FieldLogger
 
        // SafeRendezvousState from the most recent balance operation,
        // or "" if unknown. If this changes from one run to the next,
@@ -86,8 +86,8 @@ type Server struct {
        metrics    *metrics
        listening  string // for tests
 
-       Logger *logrus.Logger
-       Dumper *logrus.Logger
+       Logger logrus.FieldLogger
+       Dumper logrus.FieldLogger
 }
 
 // NewServer returns a new Server that runs Balancers using the given