highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-06-21 14:22:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

tweak timeouts on Publish()

Browse Source
This commit is contained in:
fiatjaf 2023-04-11 15:33:29 -03:00
parent dd692560ff
commit 2314db57a1
No known key found for this signature in database
GPG Key ID: BAD43C4BE5C1A3A1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
relay.go
View File

@ -273,9 +273,9 @@ func (r *Relay) Publish(ctx context.Context, event Event) (Status, error) {
var mu sync.Mutex var mu sync.Mutex
if _, ok := ctx.Deadline(); !ok { if _, ok := ctx.Deadline(); !ok {
// if no timeout is set, force it to 4 seconds // if no timeout is set, force it to 7 seconds
var cancel context.CancelFunc var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, 4*time.Second) ctx, cancel = context.WithTimeout(ctx, 7*time.Second)
defer cancel() defer cancel()
} }
@ -322,12 +322,11 @@ func (r *Relay) Publish(ctx context.Context, event Event) (Status, error) {
case <-r.ConnectionContext.Done(): case <-r.ConnectionContext.Done():
// same as above, but when the relay loses connectivity entirely // same as above, but when the relay loses connectivity entirely
return status, err return status, err
case <-time.After(2 * time.Second): case <-time.After(4 * time.Second):
// if we don't get an OK after 2 seconds, try to subscribe to the event // if we don't get an OK after 4 seconds, try to subscribe to the event
if err := sub.Fire(); err != nil { if err := sub.Fire(); err != nil {
InfoLogger.Printf("failed to subscribe to just published event %s at %s: %s", event.ID, r.URL, err) InfoLogger.Printf("failed to subscribe to just published event %s at %s: %s", event.ID, r.URL, err)
} }
case receivedEvent := <-sub.Events: case receivedEvent := <-sub.Events:
if receivedEvent == nil { if receivedEvent == nil {
// channel is closed // channel is closed