File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
17
17
- Handle 'a' vs 'an' in drinks plugin
18
18
- Apply rate limiting to regex hooks
19
19
- Ensure event order is deterministic
20
+ - Make event queueing happen non-async
20
21
### Fixed
21
22
- Ensure event order is deterministic
22
23
- Fix matching exception in horoscope test
Original file line number Diff line number Diff line change @@ -296,7 +296,7 @@ def load_clients(self):
296
296
scanner = Scanner (bot = self )
297
297
scanner .scan (clients , categories = ['cloudbot.client' ])
298
298
299
- async def process (self , event ):
299
+ def process (self , event ):
300
300
"""
301
301
:type event: Event
302
302
"""
@@ -397,8 +397,5 @@ def add_hook(hook, _event):
397
397
398
398
tasks .sort (key = lambda t : t [0 ].priority )
399
399
400
- # Run the tasks
401
- await asyncio .gather (* [
402
- asyncio .ensure_future (self .plugin_manager .launch (hook , _event ))
403
- for hook , _event in tasks
404
- ], loop = self .loop )
400
+ for _hook , _event in tasks :
401
+ async_util .wrap_future (self .plugin_manager .launch (_hook , _event ))
Original file line number Diff line number Diff line change @@ -464,8 +464,8 @@ def data_received(self, data):
464
464
self .conn .name , line , self .conn .describe_server ()
465
465
)
466
466
else :
467
- # handle the message, async
468
- async_util . wrap_future ( self .bot .process (event ), loop = self . loop )
467
+ # handle the message
468
+ self .bot .process (event )
469
469
470
470
def parse_line (self , line : str ) -> Event :
471
471
message = Message .parse (line )
You can’t perform that action at this time.
0 commit comments