12140 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jan Christian Grünhage	e7fa032126	Update .dockerignore	2018-09-25 14:33:19 +02:00
Jan Christian Grünhage	3af7a95a9d	add changelog	2018-09-20 14:55:11 +02:00
Jan Christian Grünhage	8dfb33d325	make python 3 work in the docker container	2018-09-20 14:55:11 +02:00
Neil Johnson	23b53b4ef8	Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links ... Neilj/fix room invite mail links	2018-09-20 13:32:38 +01:00
Amber Brown	1f3f5fcf52	Fix client IPs being broken on Python 3 (#3908)	2018-09-20 20:14:34 +10:00
Erik Johnston	3fd68d533b	Merge pull request #3914 from matrix-org/erikj/remove_retry_cache ... Remove get_destination_retry_timings cache	2018-09-20 10:54:49 +01:00
Amber Brown	741571cf22	Add a way to run tests in PostgreSQL in Docker (#3699)	2018-09-20 18:12:45 +10:00
Amber Brown	aeca5a5ed5	Add a regression test for logging on failed connections (#3912)	2018-09-20 16:28:18 +10:00
Richard van der Hoff	642199570c	Improve the logging when handling a federation transaction (#3904) ... Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions.	2018-09-19 17:28:18 +01:00
Erik Johnston	bbab6ebfd9	Fix up changelog and remove spurious comment	2018-09-19 14:45:14 +01:00
Erik Johnston	392a54128c	pep8	2018-09-19 14:37:49 +01:00
Erik Johnston	83ee5592a5	Newsfile	2018-09-19 14:22:59 +01:00
Erik Johnston	b9158ac2bf	Remove get_destination_retry_timings cache ... Currently we rely on the master to invalidate this cache promptly. However, after having moved most federation endpoints off of master this no longer happens, causing outbound fedeariont to get blackholed. Fixes #3798	2018-09-19 14:22:57 +01:00
Erik Johnston	cb016baa37	Merge pull request #3910 from matrix-org/erikj/update_timeout ... Update to use new timeout function everywhere.	2018-09-19 11:45:11 +01:00
Erik Johnston	80d2d50f47	Fixup	2018-09-19 11:19:47 +01:00
Erik Johnston	9407bcf37a	Replace custom DeferredTimeoutError with defer.TimeoutError	2018-09-19 11:07:29 +01:00
Erik Johnston	6c48aa0256	Run canceller first to allow it to generate correct error	2018-09-19 11:07:27 +01:00
Erik Johnston	6bbe3d5732	Newsfile	2018-09-19 10:43:13 +01:00
Erik Johnston	a334e1cace	Update to use new timeout function everywhere. ... The existing deferred timeout helper function (and the one into twisted) suffer from a bug when a deferred's canceller throws an exception, #3842. The new helper function doesn't suffer from this problem.	2018-09-19 10:39:40 +01:00
Richard van der Hoff	05b9937cd7	update changelog for #3909	2018-09-19 09:17:54 +01:00
Amber Brown	47c02e6332	Merge pull request #3909 from turt2live/travis/fix-logging-1 ... Fix matrixfederationclient.py logging: Destination is a string	2018-09-19 18:14:47 +10:00
Amber Brown	3f0d8e6b09	Remove documentation referencing Cygwin (#3873)	2018-09-19 18:14:30 +10:00
Amber Brown	3d6b24fb1b	Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name ... Set SNI to the server_name, not whatever was in the SRV record	2018-09-19 17:59:33 +10:00
Amber Brown	f773ecbd61	Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout ... Bump timeout on get_missing_events request	2018-09-19 17:57:48 +10:00
Travis Ralston	13b31a9baf	Changelog	2018-09-18 15:30:25 -06:00
Travis Ralston	35aec19f0a	Destination is a string	2018-09-18 15:29:30 -06:00
Richard van der Hoff	38ead946a9	Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links	2018-09-18 19:02:45 +01:00
Richard van der Hoff	a219ce8726	Use directory server for room joins (#3899) ... When we do a join, always try the server we used for the alias lookup first. Fixes #2418	2018-09-18 18:27:37 +01:00
Richard van der Hoff	31c15dcb80	Refactor matrixfederationclient to fix logging (#3906) ... We want to wait until we have read the response body before we log the request as complete, otherwise a confusing thing happens where the request appears to have completed, but we later fail it. To do this, we factor the salient details of a request out to a separate object, which can then keep track of the txn_id, so that it can be logged.	2018-09-18 18:17:15 +01:00
Amber Brown	c600886d47	Merge pull request #3894 from matrix-org/hs/phone_home_py_version ... Add python_version phone home stat	2018-09-19 02:40:04 +10:00
Richard van der Hoff	edabc18938	changelog	2018-09-18 17:04:20 +01:00
Richard van der Hoff	b3097396e7	Set SNI to the server_name, not whatever was in the SRV record ... Fixes #3843	2018-09-18 17:01:12 +01:00
Richard van der Hoff	8565d9a9fe	changelog	2018-09-18 15:05:26 +01:00
Richard van der Hoff	550007cb0e	Bump timeout on get_missing_events request	2018-09-18 15:02:51 +01:00
Richard van der Hoff	286d6930b7	Merge pull request #3879 from matrix-org/matthew/fix-autojoin ... don't ratelimit autojoins	2018-09-18 13:07:01 +01:00
Richard van der Hoff	892432c818	Merge pull request #3882 from SimmyD/max_upload_docker_var ... Add variable for changing the max upload size in Docker container	2018-09-18 13:05:09 +01:00
Richard van der Hoff	1e09a1d48a	Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias ... Return a 404 when deleting unknown room alias	2018-09-18 12:59:30 +01:00
Richard van der Hoff	ad95ec12ca	Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics ... Fix more b'abcd' noise in metrics	2018-09-18 12:58:49 +01:00
Richard van der Hoff	1f4296efcf	Merge pull request #3897 from aaronraimist/synaspse-typo ... Fix typo in README, synaspse -> synapse	2018-09-18 11:37:09 +01:00
Aaron Raimist	505abb38f0	Add changelog ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-09-17 22:07:19 -05:00
Aaron Raimist	4ecdf73fc7	Fix typo in README, synaspse -> synapse ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-09-17 22:05:23 -05:00
Will Hunt	2b41f2ed76	Create 3894.feature	2018-09-17 17:48:48 +01:00
Will Hunt	5baa087312	typo	2018-09-17 17:37:56 +01:00
Will Hunt	b58714789f	make pip happy?	2018-09-17 17:35:54 +01:00
Richard van der Hoff	06f2dbbb5d	changelog	2018-09-17 17:18:26 +01:00
Richard van der Hoff	ac80cb08fe	Fix more b'abcd' noise in metrics	2018-09-17 17:16:50 +01:00
Will Hunt	9a1cceeca9	Use a string for versions	2018-09-17 17:09:06 +01:00
Richard van der Hoff	c7131baefc	Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logs ... Fix some b'abcd' noise in logs and metrics	2018-09-17 17:07:10 +01:00
Richard van der Hoff	f75b9961c6	Reinstate missing null check	2018-09-17 16:52:02 +01:00
Will Hunt	2b39494cd5	Add python_version phone home stat	2018-09-17 16:35:18 +01:00