mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 14:32:24 -05:00 
			
		
		
		
	[bugfix] fix possible mutex lockup during streaming code (#2633)
* rewrite Stream{} to use much less mutex locking, update related code
* use new context for the stream context
* ensure stream gets closed on return of writeTo / readFrom WSConn()
* ensure stream write timeout gets cancelled
* remove embedded context type from Stream{}, reformat log messages for consistency
* use c.Request.Context() for context passed into Stream().Open()
* only return 1 boolean, fix tests to expect multiple stream types in messages
* changes to ping logic
* further improved ping logic
* don't export unused function types, update message sending to only include relevant stream type
* ensure stream gets closed 🤦
* update to error log on failed json marshal (instead of panic)
* inverse websocket read error checking to _ignore_ expected close errors
	
	
This commit is contained in:
		
					parent
					
						
							
								8cafa6b74b
							
						
					
				
			
			
				commit
				
					
						291e180990
					
				
			
		
					 14 changed files with 535 additions and 451 deletions
				
			
		|  | @ -18,8 +18,6 @@ | |||
| package stream | ||||
| 
 | ||||
| import ( | ||||
| 	"sync" | ||||
| 
 | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/stream" | ||||
|  | @ -28,53 +26,13 @@ import ( | |||
| type Processor struct { | ||||
| 	state       *state.State | ||||
| 	oauthServer oauth.Server | ||||
| 	streamMap   *sync.Map | ||||
| 	streams     stream.Streams | ||||
| } | ||||
| 
 | ||||
| func New(state *state.State, oauthServer oauth.Server) Processor { | ||||
| 	return Processor{ | ||||
| 		state:       state, | ||||
| 		oauthServer: oauthServer, | ||||
| 		streamMap:   &sync.Map{}, | ||||
| 		streams:     stream.Streams{}, | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // toAccount streams the given payload with the given event type to any streams currently open for the given account ID. | ||||
| func (p *Processor) toAccount(payload string, event string, streamTypes []string, accountID string) error { | ||||
| 	// Load all streams open for this account. | ||||
| 	v, ok := p.streamMap.Load(accountID) | ||||
| 	if !ok { | ||||
| 		return nil // No entry = nothing to stream. | ||||
| 	} | ||||
| 	streamsForAccount := v.(*stream.StreamsForAccount) | ||||
| 
 | ||||
| 	streamsForAccount.Lock() | ||||
| 	defer streamsForAccount.Unlock() | ||||
| 
 | ||||
| 	for _, s := range streamsForAccount.Streams { | ||||
| 		s.Lock() | ||||
| 		defer s.Unlock() | ||||
| 
 | ||||
| 		if !s.Connected { | ||||
| 			continue | ||||
| 		} | ||||
| 
 | ||||
| 	typeLoop: | ||||
| 		for _, streamType := range streamTypes { | ||||
| 			if _, found := s.StreamTypes[streamType]; found { | ||||
| 				s.Messages <- &stream.Message{ | ||||
| 					Stream:  []string{streamType}, | ||||
| 					Event:   string(event), | ||||
| 					Payload: payload, | ||||
| 				} | ||||
| 
 | ||||
| 				// Break out to the outer loop, | ||||
| 				// to avoid sending duplicates of | ||||
| 				// the same event to the same stream. | ||||
| 				break typeLoop | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return nil | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue