8366 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Hunt	c144292373	Modify test_user_sync so it doesn't look at last_active_ts over last_user_sync_ts	2017-03-15 15:38:57 +00:00
Will Hunt	e6032054bf	Add a great comment to handle_timeout for active vs sync times.	2017-03-15 15:24:48 +00:00
Will Hunt	ebf5a6b14c	Add fallback to last_active_ts if it beats the last sync time.	2017-03-15 15:17:16 +00:00
Richard van der Hoff	5f14e7e982	Merge pull request #2010 from matrix-org/rav/fix_txnq_wedge ... Fix assertion to stop transaction queue getting wedged	2017-03-15 13:07:50 +00:00
Richard van der Hoff	29ed09e80a	Fix assertion to stop transaction queue getting wedged ... ... and update some docstrings to correctly reflect the types being used. get_new_device_msgs_for_remote can return a long under some circumstances, which was being stored in last_device_list_stream_id_by_dest, and was then upsetting things on the next loop.	2017-03-15 12:16:55 +00:00
Erik Johnston	3b2dd1b3c2	Merge pull request #2008 from matrix-org/erikj/notifier_stats ... Add some metrics on notifier	2017-03-15 11:25:02 +00:00
Erik Johnston	872e75a3d5	Add some metrics on notifier	2017-03-15 10:56:51 +00:00
Erik Johnston	7827251daf	Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 ... Phone number registration / login support v2	2017-03-15 09:59:54 +00:00
Richard van der Hoff	f2ed64eaaf	Merge pull request #1992 from matrix-org/rav/fix_media_loop ... Fix routing loop when fetching remote media	2017-03-14 23:40:35 +00:00
Richard van der Hoff	ef328b2fc1	kick jenkins	2017-03-14 20:44:50 +00:00
Erik Johnston	bad72b0b8e	Merge pull request #2002 from matrix-org/erikj/dont_sync_by_default ... Reduce number of spurious sync result generations.	2017-03-14 16:58:45 +00:00
Erik Johnston	1bf84c4b6b	Merge pull request #1989 from matrix-org/erikj/public_list_speed ... Speed up public room list	2017-03-14 16:58:26 +00:00
Erik Johnston	fd2eef49c8	Reduce spurious calls to generate sync	2017-03-14 16:33:45 +00:00
Richard van der Hoff	1d09586599	Address review comments ... - don't blindly proxy all HTTPRequestExceptions - log unexpected exceptions at error - avoid `isinstance` - improve docs on `from_http_response_exception`	2017-03-14 14:15:37 +00:00
Richard van der Hoff	7f237800e9	re-refactor exception heirarchy ... Give CodeMessageException back its `msg` attribute, and use that to hold the HTTP status message for HttpResponseException.	2017-03-14 14:15:37 +00:00
Erik Johnston	bb256ac96f	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed	2017-03-14 11:35:05 +00:00
Erik Johnston	6a3c5d6891	Merge pull request #1996 from matrix-org/erikj/fix_current_state ... Fix current_state_events table to not lie	2017-03-14 11:34:35 +00:00
Erik Johnston	cc7a294e2e	Fix current_state_events table to not lie ... If we try and persist two state events that have the same ancestor we calculate the wrong current state when persisting those events.	2017-03-14 10:57:43 +00:00
David Baker	7b6ed9871e	Use extend instead of +=	2017-03-14 10:49:55 +00:00
David Baker	d79a687d85	Oops, remove print	2017-03-14 10:40:20 +00:00
Luke Barnard	f29d85d9e4	Merge pull request #1993 from matrix-org/luke/delete-devices ... Implement delete_devices API	2017-03-14 10:02:56 +00:00
Luke Barnard	bbeeb97f75	Implement _simple_delete_many_txn, use it to delete devices ... (But this doesn't implement the same for deleting access tokens or e2e keys. Also respond to code review.	2017-03-13 17:53:23 +00:00
David Baker	0a9945220e	Fix registration for broken clients ... Only offer msisdn flows if the x_show_msisdn option is given.	2017-03-13 17:29:38 +00:00
David Baker	73a5f06652	Support registration / login with phone number ... Changes from https://github.com/matrix-org/synapse/pull/1971	2017-03-13 17:27:51 +00:00
Luke Barnard	c077c3277b	Flake	2017-03-13 16:45:38 +00:00
Richard van der Hoff	31f3ca1b2b	Merge pull request #1990 from matrix-org/rav/log_config_comments ... Add helpful texts to logger config options	2017-03-13 16:42:12 +00:00
Luke Barnard	c81f33f73d	Implement delete_devices API ... This implements the proposal here https://docs.google.com/document/d/1C-25Gqz3TXy2jIAoeOKxpNtmme0jI4g3yFGqv5GlAAk for deleting multiple devices at once in a single request.	2017-03-13 16:33:51 +00:00
Richard van der Hoff	170ccc9de5	Fix routing loop when fetching remote media ... When we proxy a media request to a remote server, add a query-param, which will tell the remote server to 404 if it doesn't recognise the server_name. This should fix a routing loop where the server keeps forwarding back to itself. Also improves the error handling on remote media fetches, so that we don't always return a rather obscure 502.	2017-03-13 16:30:36 +00:00
Erik Johnston	45c7f12d2a	Add new storage function to slave store	2017-03-13 16:26:44 +00:00
Richard van der Hoff	2cad971ab4	Merge pull request #1978 from matrix-org/rav/refactor_received_pdu ... Refactor FederationServer._handle_new_pdu	2017-03-13 12:45:46 +00:00
Richard van der Hoff	8d86d11fdf	Bring example log config into line with default	2017-03-13 12:39:09 +00:00
Richard van der Hoff	6037a9804c	Add helpful texts to logger config options	2017-03-13 12:33:35 +00:00
Richard van der Hoff	3c69f32402	Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu	2017-03-13 12:20:47 +00:00
Richard van der Hoff	6bfe8e32b5	Merge pull request #1983 from matrix-org/rav/no_redirect_stdio ... Add an option to disable stdio redirect	2017-03-13 12:20:07 +00:00
Richard van der Hoff	5fc9261929	Merge pull request #1982 from matrix-org/rav/sighup_for_logconfig ... Reread log config on SIGHUP	2017-03-13 12:19:54 +00:00
Erik Johnston	0162994983	Comments	2017-03-13 11:53:26 +00:00
Erik Johnston	7eae6eaa2f	Revert "Support registration & login with phone number"	2017-03-13 09:59:33 +00:00
Erik Johnston	79926e016e	Assume rooms likely haven't changed	2017-03-13 09:50:10 +00:00
Erik Johnston	8ffbe43ba1	Get current state by using current_state_events table	2017-03-10 17:39:35 +00:00
Richard van der Hoff	bcfa5cd00c	Add an option to disable stdio redirect ... This makes it tractable to run synapse under pdb.	2017-03-10 15:38:29 +00:00
Richard van der Hoff	d84bd51e95	Refactor logger config for workers ... - to make it easier to add more config options.	2017-03-10 15:34:01 +00:00
Richard van der Hoff	9072a8c627	Reread log config on SIGHUP ... When we are using a log_config file, reread it on SIGHUP.	2017-03-10 15:29:55 +00:00
Erik Johnston	3872c7a107	Merge pull request #1976 from matrix-org/erikj/device_delete_sync ... Noop repated delete device inbox calls from /sync	2017-03-10 13:24:28 +00:00
Erik Johnston	8f267fa8a8	Fix it for the workers	2017-03-10 11:22:25 +00:00
Erik Johnston	64d62e41b8	Noop repated delete device inbox calls from /sync	2017-03-10 10:36:43 +00:00
Erik Johnston	3545e17f43	Add setdefault key to ExpiringCache	2017-03-10 10:30:49 +00:00
Richard van der Hoff	29235901b8	Move FederationServer._handle_new_pdu to FederationHandler ... Unfortunately this significantly increases the size of the already-rather-big FederationHandler, but the code fits more naturally here, and it paves the way for the tighter integration that I need between handling incoming PDUs and doing the join dance. Other than renaming the existing `FederationHandler.on_receive_pdu` to `_process_received_pdu` to make way for it, this just consists of the move, and replacing `self.handler` with `self` and `self` with `self.replication_layer`.	2017-03-09 16:20:13 +00:00
Richard van der Hoff	e8b1721290	Move sig check out of _handle_new_pdu ... When we receive PDUs via `get_missing_events`, we have already checked their sigs, so there is no need to do it again.	2017-03-09 15:50:44 +00:00
Richard van der Hoff	3406333a58	Factor _get_missing_events_for_pdu out of _handle_new_pdu ... This should be functionally identical: it just seeks to improve readability by reducing indentation.	2017-03-09 15:50:44 +00:00
Richard van der Hoff	45d173a59a	Fix docstring	2017-03-09 15:50:29 +00:00