Skip to content

Commit cdf8920

Browse files
committed
more logs
1 parent 31a6641 commit cdf8920

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

pkg/loop/internal/relayer/relayer.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ func NewPluginRelayerClient(brokerCfg net.BrokerConfig) *PluginRelayerClient {
5050
}
5151

5252
func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry core.CapabilitiesRegistry) (looptypes.Relayer, error) {
53+
p.BrokerExt.Logger.Infow("PluginRelayerClient.NewRelayer called", "config", config)
54+
5355
cc := p.NewClientConn("Relayer", func(ctx context.Context) (relayerID uint32, deps net.Resources, err error) {
5456
var ksRes net.Resource
5557
ksID, ksRes, err := p.ServeNew("Keystore", func(s *grpc.Server) {
@@ -76,7 +78,7 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
7678
return 0, nil, fmt.Errorf("failed to serve new capability registry: %w", err)
7779
}
7880
deps.Add(capabilityRegistryResource)
79-
81+
p.BrokerExt.Logger.Infow("PluginRelayerClient.NewRelayer sending gRPC request")
8082
reply, err := p.pluginRelayer.NewRelayer(ctx, &pb.NewRelayerRequest{
8183
Config: config,
8284
KeystoreID: ksID,
@@ -86,6 +88,7 @@ func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, key
8688
if err != nil {
8789
return 0, nil, fmt.Errorf("Failed to create relayer client: failed request: %w", err)
8890
}
91+
p.BrokerExt.Logger.Infow("PluginRelayerClient.NewRelayer got reply", "relayerID", reply.RelayerID)
8992
return reply.RelayerID, nil, nil
9093
})
9194
return newRelayerClient(p.BrokerExt, cc), nil
@@ -111,7 +114,12 @@ func newPluginRelayerServer(broker net.Broker, brokerCfg net.BrokerConfig, impl
111114
}
112115

113116
func (p *pluginRelayerServer) NewRelayer(ctx context.Context, request *pb.NewRelayerRequest) (*pb.NewRelayerReply, error) {
114-
p.Logger.Info("CALLING NEWRELAYER AGAIN")
117+
p.Logger.Infow("pluginRelayerServer.NewRelayer called",
118+
"config", request.Config,
119+
"keystoreID", request.KeystoreID,
120+
"csaKeystoreID", request.KeystoreCSAID,
121+
"capRegistryID", request.CapabilityRegistryID,
122+
)
115123
ksConn, err := p.Dial(request.KeystoreID)
116124
if err != nil {
117125
return nil, net.ErrConnDial{Name: "Keystore", ID: request.KeystoreID, Err: err}
@@ -138,7 +146,7 @@ func (p *pluginRelayerServer) NewRelayer(ctx context.Context, request *pb.NewRel
138146
p.CloseAll(ksRes, ksCSARes, crRes)
139147
return nil, err
140148
}
141-
p.Logger.Info("STARTING RELAYER AGAIN:", r.Name())
149+
p.Logger.Infow("pluginRelayerServer.NewRelayer starting relayer", "name", r.Name())
142150
err = r.Start(ctx)
143151
if err != nil {
144152
p.CloseAll(ksRes, ksCSARes, crRes)

pkg/loop/relayer_service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func NewRelayerService(lggr logger.Logger, grpcOpts GRPCOpts, cmd func() *exec.C
3838
lggr = logger.Named(lggr, "RelayerService")
3939
var rs RelayerService
4040
broker := BrokerConfig{StopCh: stopCh, Logger: lggr, GRPCOpts: grpcOpts}
41+
lggr.Info("LGGR SERVICE RELAYER SERVICE ABOUT TO BE INITIALIZED")
4142
rs.Init(PluginRelayerName, &GRPCPluginRelayer{BrokerConfig: broker}, newService, lggr, cmd, stopCh)
4243
return &rs
4344
}

0 commit comments

Comments
 (0)