From 39dd851e5e362c02258feba6030e7933057adb33 Mon Sep 17 00:00:00 2001 From: lalexgap Date: Mon, 21 Aug 2023 13:29:42 -0700 Subject: [PATCH] clean up set logger --- internal/rpc/rpc.go | 2 +- node_test/rpc_test.go | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/rpc/rpc.go b/internal/rpc/rpc.go index 2533365b03..2ec1041692 100644 --- a/internal/rpc/rpc.go +++ b/internal/rpc/rpc.go @@ -44,7 +44,7 @@ func InitChainServiceAndRunRpcServer(pkString string, chainOpts chain.ChainOpts, return nil, nil, nil, err } - slog.Info("Nitro as a Service listening", "rpc-port", rpcPort, "msg-port", msgPort, "transport", transportType) + slog.Info("Nitro as a Service listening", "rpc-port", rpcPort, "msg-port", msgPort, "transport", transportType, "address", node.Address.String()) return rpcServer, node, messageService, nil } diff --git a/node_test/rpc_test.go b/node_test/rpc_test.go index 4d48c71048..b515b1c1a4 100644 --- a/node_test/rpc_test.go +++ b/node_test/rpc_test.go @@ -34,11 +34,6 @@ func simpleOutcome(a, b types.Address, aBalance, bBalance uint) outcome.Exit { return testdata.Outcomes.Create(a, b, aBalance, bBalance, types.Address{}) } -func setLogger(logDestination *os.File, clientAddress *types.Address, rpcRole string) { - h := slog.NewJSONHandler(logDestination, &slog.HandlerOptions{Level: slog.LevelDebug}) - slog.SetDefault(slog.New(h).With("rpc", rpcRole, "address", clientAddress)) -} - func TestRpcWithNats(t *testing.T) { for _, n := range []int{2, 3, 4} { executeNRpcTestWrapper(t, "nats", n, false) @@ -403,8 +398,8 @@ func setupNitroNodeWithRPCClient( if err != nil { t.Fatal(err) } - - setLogger(logDestination, rpcServer.Address(), "client") + h := slog.NewJSONHandler(logDestination, &slog.HandlerOptions{Level: slog.LevelDebug}) + slog.SetDefault(slog.New(h)) var clientConnection transport.Requester switch connectionType {