6249 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	3306cf45ca	Merge pull request #750 from matrix-org/erikj/jwt_optional ... Make pyjwt dependency optional	2016-04-26 11:07:22 +01:00
Mark Haines	c487c42492	Merge pull request #752 from matrix-org/markjh/more_updates ... Add a couple of update methods to the PusherSlaveStore	2016-04-26 11:00:40 +01:00
Mark Haines	9c417c54d4	Add a couple of update methods to the PusherSlaveStore	2016-04-26 10:45:02 +01:00
Mark Haines	9843f2a657	Merge pull request #751 from matrix-org/markjh/pusher_metrics_manhole ... Add a metrics listener and a ssh listener to the pusher	2016-04-26 10:35:51 +01:00
Mark Haines	f15e9e8de4	Remove the uncomments from the comments	2016-04-25 17:56:24 +01:00
Mark Haines	72e2fafa20	Add a metrics listener and a ssh listener to the pusher	2016-04-25 17:34:25 +01:00
Mark Haines	233bf78ab4	Merge pull request #749 from matrix-org/markjh/split_manhole ... Split out setting up the manhole to a separate file	2016-04-25 15:23:53 +01:00
Mark Haines	f22f46f4f9	Move the listenTCP call outside the manhole function	2016-04-25 14:59:21 +01:00
Erik Johnston	52ecbc2843	Make pyjwt dependency optional	2016-04-25 14:30:15 +01:00
Mark Haines	5905f36f05	Split out setting up the manhole to a separate file	2016-04-22 17:09:15 +01:00
Mark Haines	c3f8dbf6b5	Merge pull request #748 from matrix-org/markjh/split_out_site.py ... Move SynapseSite to its own file	2016-04-22 17:08:21 +01:00
Mark Haines	62607d5452	Merge branch 'develop' into markjh/split_out_site.py ... Conflicts: synapse/app/homeserver.py	2016-04-22 16:26:57 +01:00
Mark Haines	e57df8fa86	Merge pull request #747 from matrix-org/markjh/http_resource_tree ... Split out create_resource_tree to a separate file	2016-04-22 16:24:55 +01:00
Mark Haines	e856036f4c	Move SynapseSite to its own file	2016-04-22 16:09:55 +01:00
Mark Haines	9e7aa98c22	Split out create_resource_tree to a separate file	2016-04-22 15:40:51 +01:00
Mark Haines	2022ae0fb9	Merge pull request #746 from matrix-org/markjh/split_out_pusher ... Optionally split out the pushers into a separate process	2016-04-22 11:34:08 +01:00
Erik Johnston	64ec3493c1	Merge pull request #745 from matrix-org/erikj/search-index ... Optimise event_search in postgres	2016-04-22 11:23:49 +01:00
Erik Johnston	4063fe0283	Update port script	2016-04-22 10:35:53 +01:00
Erik Johnston	183cacac90	Simplify query and handle finishing correctly	2016-04-22 10:01:57 +01:00
Erik Johnston	ae571810f2	Order NULLs first	2016-04-21 18:14:18 +01:00
Erik Johnston	3ddbb1687c	Fix query	2016-04-21 18:02:36 +01:00
Erik Johnston	8fae3d7b1e	Use special UPDATE syntax	2016-04-21 18:01:49 +01:00
Erik Johnston	b57dcb4b51	Typo	2016-04-21 17:49:00 +01:00
Erik Johnston	26db18bc90	Need to do _background_update_progress_txn in actual transaction	2016-04-21 17:45:56 +01:00
Erik Johnston	b9675ef6e6	Merge pull request #687 from nikriek/jwt-fix ... Fix issues with JWT login	2016-04-21 17:42:25 +01:00
Erik Johnston	e395eb1108	Update progress when creating index	2016-04-21 17:39:24 +01:00
Erik Johnston	3b0fa77f50	Fix SQL statement	2016-04-21 17:37:42 +01:00
Erik Johnston	129e403487	Create index must be on a conn	2016-04-21 17:35:51 +01:00
Mark Haines	a3ac837599	Optionally split out the pushers into a separate process	2016-04-21 17:22:37 +01:00
Mark Haines	78741cf025	Merge pull request #743 from matrix-org/markjh/slave_pushers ... Replicate the pushers	2016-04-21 17:21:29 +01:00
Erik Johnston	51bb339ab2	Create index concurrently	2016-04-21 17:16:11 +01:00
Erik Johnston	b743c1237e	Add missing run_upgrade	2016-04-21 17:12:04 +01:00
Mark Haines	31719ad124	Merge pull request #744 from matrix-org/markjh/replication_remove_pusher ... Add a replication endpoint for deleting pushers	2016-04-21 17:10:49 +01:00
Niklas Riekenbrauck	565c2edb0a	Fix issues with JWT login	2016-04-21 18:10:48 +02:00
Erik Johnston	c877f0f034	Optimise event_search in postgres	2016-04-21 16:56:14 +01:00
Mark Haines	b15266fe06	Merge pull request #742 from matrix-org/markjh/slave_event_push_actions ... Replicate push actions	2016-04-21 16:39:04 +01:00
Mark Haines	cfe1ff4bdb	Add a replication endpoint for deleting pushers	2016-04-21 16:33:05 +01:00
Mark Haines	d4823efad9	Replicate the pushers	2016-04-21 16:18:00 +01:00
Mark Haines	9f53491cab	Merge branch 'develop' into markjh/slave_event_push_actions	2016-04-21 16:00:43 +01:00
Mark Haines	02a27a6c4f	pip install new python dependencies in jenkins.sh	2016-04-21 16:00:28 +01:00
Mark Haines	a611c968cc	Merge branch 'develop' into markjh/slave_event_push_actions	2016-04-21 15:37:01 +01:00
Erik Johnston	59698906eb	Make jenkins install lxml	2016-04-21 15:36:13 +01:00
Mark Haines	c0d8e0eb63	Replicate push actions	2016-04-21 15:25:58 +01:00
Erik Johnston	68ebb81e86	Merge pull request #740 from matrix-org/erikj/state_cache ... Always use state cache entry if it exists	2016-04-20 13:52:59 +01:00
Erik Johnston	5bbc321588	Always use state cache entry if it exists ... Also check if the resolved state matches an existing state group.	2016-04-20 11:49:10 +01:00
Erik Johnston	4cf4320593	Add some logging to state resolve_events	2016-04-20 11:06:02 +01:00
Erik Johnston	eab47ea1e5	Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups ... Add cache to _get_state_groups_from_groups	2016-04-19 17:37:19 +01:00
Mark Haines	f52dd35ac3	Merge pull request #738 from matrix-org/markjh/slaved_receipts ... Add a slaved receipts store	2016-04-19 17:31:59 +01:00
Erik Johnston	61c7edfd34	Add cache to _get_state_groups_from_groups	2016-04-19 17:22:03 +01:00
Mark Haines	5bbd424ee0	Add a slaved receipts store	2016-04-19 17:14:08 +01:00