diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-21 13:40:20 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-21 13:40:20 +0000 |
| commit | ed1d189e10e7fe81550cdc234d39de7c6a9db180 (patch) | |
| tree | e6ede327030451ca37f6c6e3aa605eb719971a27 | |
| parent | Merge pull request #509 from matrix-org/erikj/dns_cache (diff) | |
| parent | SYN-606: Peeking does not wake up /events (diff) | |
| download | synapse-ed1d189e10e7fe81550cdc234d39de7c6a9db180.tar.xz | |
Merge pull request #515 from matrix-org/erikj/syn-606
SYN-606: Peeking does not wake up /events
| -rw-r--r-- | synapse/notifier.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index 3285487551..262a684f64 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -403,7 +403,9 @@ class Notifier(object): # over /events. # # I am sorry for what I have done. - user_id_for_stream = "_PEEKING_" + user_id_for_stream + user_id_for_stream = "_PEEKING_%s_%s" % ( + explicit_room_id, user_id_for_stream + ) result = yield self.wait_for_events( user_id_for_stream, |