Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #776 from matrix-org/markjh/lazy_signing_key 

Shuffle when we get the signing_key attribute.
This commit is contained in:
Mark Haines 2016-05-11 13:31:29 +02:00
parent 108434e53d 1620578b13
commit 260b498ee5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/message.py
View File

@ -48,7 +48,6 @@ class MessageHandler(BaseHandler):
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.validator = EventValidator() self.validator = EventValidator()
self.snapshot_cache = SnapshotCache() self.snapshot_cache = SnapshotCache()
self.signing_key = hs.config.signing_key[0]
@defer.inlineCallbacks @defer.inlineCallbacks
def get_messages(self, requester, room_id=None, pagin_config=None, def get_messages(self, requester, room_id=None, pagin_config=None,
@ -766,8 +765,9 @@ class MessageHandler(BaseHandler):
yield self.auth.add_auth_events(builder, context) yield self.auth.add_auth_events(builder, context)
signing_key = self.hs.config.signing_key[0]
add_hashes_and_signatures( add_hashes_and_signatures(
builder, self.server_name, self.signing_key builder, self.server_name, signing_key
) )
event = builder.build() event = builder.build()