Skip to content

Explicitly name all subscriptions #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 28, 2022
Merged

Explicitly name all subscriptions #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
352f376
Explicitly name all subscriptions
peterbroadhurst Feb 28, 2022
323e6ba
Remove duplicate code block
peterbroadhurst Feb 28, 2022
0422b76
Include the topic name in logs
peterbroadhurst Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions internal/blockchain/ethereum/ethereum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func (e *Ethereum) Init(ctx context.Context, prefix config.Prefix, callbacks blo
if e.initInfo.stream, err = e.streams.ensureEventStream(e.ctx, e.topic, batchSize, batchTimeout); err != nil {
return err
}
log.L(e.ctx).Infof("Event stream: %s", e.initInfo.stream.ID)
log.L(e.ctx).Infof("Event stream: %s (topic=%s)", e.initInfo.stream.ID, e.topic)
if e.initInfo.sub, err = e.streams.ensureSubscription(e.ctx, e.instancePath, e.initInfo.stream.ID, batchPinEventABI); err != nil {
return err
}
Expand Down Expand Up @@ -615,7 +615,8 @@ func (e *Ethereum) AddSubscription(ctx context.Context, subscription *fftypes.Co
return i18n.WrapError(ctx, err, i18n.MsgContractParamInvalid)
}

result, err := e.streams.createSubscription(ctx, location, e.initInfo.stream.ID, abi)
subName := fmt.Sprintf("ff-sub-%s", subscription.ID)
result, err := e.streams.createSubscription(ctx, location, e.initInfo.stream.ID, subName, abi)
if err != nil {
return err
}
Expand Down
5 changes: 3 additions & 2 deletions internal/blockchain/ethereum/eventstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ func (s *streamManager) getSubscriptions(ctx context.Context) (subs []*subscript
return subs, nil
}

func (s *streamManager) createSubscription(ctx context.Context, location *Location, stream string, abi ABIElementMarshaling) (*subscription, error) {
func (s *streamManager) createSubscription(ctx context.Context, location *Location, stream, subName string, abi ABIElementMarshaling) (*subscription, error) {
sub := subscription{
Name: subName,
Stream: stream,
FromBlock: "0",
Address: location.Address,
Expand Down Expand Up @@ -189,7 +190,7 @@ func (s *streamManager) ensureSubscription(ctx context.Context, instancePath, st
}

if sub == nil {
if sub, err = s.createSubscription(ctx, location, stream, abi); err != nil {
if sub, err = s.createSubscription(ctx, location, stream, subName, abi); err != nil {
return nil, err
}
}
Expand Down
5 changes: 0 additions & 5 deletions internal/contracts/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,11 +496,6 @@ func (cm *contractManager) AddContractSubscription(ctx context.Context, ns strin
if sub.Name == "" {
sub.Name = sub.ProtocolID
}

if sub.Name == "" {
sub.Name = sub.ProtocolID
}

if err = cm.database.UpsertContractSubscription(ctx, &sub.ContractSubscription); err != nil {
return nil, err
}
Expand Down