4135 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	19505e0392	Disable GZip encoding on static file resources as per comment	2015-05-19 13:20:25 +01:00
Erik Johnston	df431b127b	Add forgotten .items()	2015-05-19 13:14:21 +01:00
Erik Johnston	882ac83d8d	Fix scripts-dev/convert_server_keys.py to have correct format	2015-05-19 13:12:55 +01:00
Erik Johnston	d3e09f12d0	SYN-383: Actually, we expect this value to be a dict	2015-05-19 13:12:41 +01:00
Erik Johnston	677be13ffc	Revert accidental commit	2015-05-19 13:12:28 +01:00
Erik Johnston	350b88656a	SYN-383: Actually, we expect this value to be a dict	2015-05-19 13:01:57 +01:00
Erik Johnston	9de94d5a4d	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf	2015-05-19 12:50:17 +01:00
Erik Johnston	2b7120e233	SYN-383: Handle the fact the server might not have signed things	2015-05-19 12:49:38 +01:00
Erik Johnston	8b256a7296	Don't reuse var names	2015-05-19 11:58:22 +01:00
Erik Johnston	62ccc6d95f	Don't reuse var names	2015-05-19 11:58:04 +01:00
Erik Johnston	01858bcbf2	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf	2015-05-19 11:56:35 +01:00
Erik Johnston	2aeee2a905	SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return	2015-05-19 11:56:18 +01:00
Erik Johnston	5e7883ec19	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf	2015-05-19 10:50:43 +01:00
Mark Haines	c6a03c46e6	SYN-383: Extract the response list from 'server_keys' in the response JSON as it might work better than iterating over the top level dict	2015-05-19 10:23:02 +01:00
Mark Haines	e4c65b338d	Speed up the get_pagination_rows as well	2015-05-18 18:21:06 +01:00
Mark Haines	99914ec9f8	Merge pull request #152 from matrix-org/notifier_performance ... Notifier performance	2015-05-18 17:49:59 +01:00
Erik Johnston	ef910a0358	Do work in parellel when joining a room	2015-05-18 17:17:04 +01:00
Mark Haines	591c4bf223	Cache the most recent serial for each room	2015-05-18 16:21:51 +01:00
Mark Haines	e1150cac4b	Move updating the serial and state of the presence cache into a single function	2015-05-18 15:46:37 +01:00
Erik Johnston	165eb2dbe6	Comments and shuffle of functions	2015-05-18 15:18:41 +01:00
Mark Haines	880fb46de0	Merge branch 'notifier_performance' into markjh/presence_performance	2015-05-18 14:33:58 +01:00
Mark Haines	9396723995	Merge pull request #154 from matrix-org/erikj/events_move ... Move get_events functions to storage.events	2015-05-18 14:24:35 +01:00
Erik Johnston	65878a2319	Remove unused metric	2015-05-18 14:06:30 +01:00
Mark Haines	ad31fa3040	Don't bother sorting by the room_stream_ids, it shouldn't matter which order they are notified in	2015-05-18 14:04:58 +01:00
Erik Johnston	4d1b6f4ad1	Remove rejected events if we don't want rejected events	2015-05-18 14:03:46 +01:00
Mark Haines	0b0033c40b	Merge branch 'develop' into notifier_performance	2015-05-18 13:50:01 +01:00
Mark Haines	755def8083	Add more doc string, reduce C+P boilerplate for getting room list	2015-05-18 13:46:47 +01:00
Mark Haines	1e90715a3d	Make sure the notifier stream token goes forward when it is updated. Sort the pending events by the correct room_stream_id	2015-05-18 13:17:36 +01:00
Erik Johnston	131bdf9bb1	Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf	2015-05-18 10:23:37 +01:00
Erik Johnston	10f1bdb9a2	Move get_events functions to storage.events	2015-05-18 10:21:40 +01:00
Erik Johnston	d5cea26d45	Remove pointless newline	2015-05-18 10:16:45 +01:00
Erik Johnston	c71176858b	Newline, remove debug logging	2015-05-18 10:11:14 +01:00
Erik Johnston	f8bd4de87d	Remove debug logging	2015-05-18 09:58:03 +01:00
Erik Johnston	c3b37abdfd	PEP8	2015-05-15 16:59:58 +01:00
Erik Johnston	6c74fd62a0	Revert limiting of fetching, it didn't help perf.	2015-05-15 16:45:35 +01:00
Erik Johnston	9ff7f66a2b	init j	2015-05-15 16:36:03 +01:00
Erik Johnston	70f272f71c	Don't completely drain the list	2015-05-15 16:34:17 +01:00
Erik Johnston	8763dd80ef	Don't fetch prev_content for current_state	2015-05-15 15:33:01 +01:00
Erik Johnston	807229f2f2	Err, defer.gatherResults ftw	2015-05-15 15:20:29 +01:00
Erik Johnston	acb12cc811	Make store.get_current_state fetch events asyncly	2015-05-15 15:20:05 +01:00
Erik Johnston	d62dee7eae	Remove more debug logging	2015-05-15 15:06:37 +01:00
Erik Johnston	0f29cfabc3	Remove debug logging	2015-05-15 14:06:42 +01:00
Erik Johnston	e275a9c0d9	preserve log context	2015-05-15 11:54:51 +01:00
Erik Johnston	aa32bd38e4	Add a wait	2015-05-15 11:35:04 +01:00
Erik Johnston	372d4c6d7b	Srsly. Don't use closures. Baaaaaad	2015-05-15 11:26:00 +01:00
Erik Johnston	575ec91d82	Correctly pass through params	2015-05-15 11:15:10 +01:00
Mark Haines	10be983f2c	Merge pull request #153 from matrix-org/markjh/presence_docstring ... Add some doc strings for presence.	2015-05-15 11:11:47 +01:00
Mark Haines	415b158ce2	More whitespace	2015-05-15 11:09:47 +01:00
Erik Johnston	de01438a57	Sort out error handling	2015-05-15 11:00:50 +01:00
Erik Johnston	a2c4f3f150	Fix daedlock	2015-05-15 10:54:04 +01:00