matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3933 from matrix-org/erikj/destination_retry_cache	Erik Johnston	2018-10-01	3	-3/+45
\|\ \| \| \| \|	Add a five minute cache to get_destination_retry_timings
\| *	Correctly match 'dict.pop' api	Erik Johnston	2018-10-01	1	-3/+11
\| \|
\| *	Don't update eviction metrics on explicit removal	Erik Johnston	2018-10-01	1	-5/+0
\| \|
\| *	Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache	Richard van der Hoff	2018-09-28	51	-426/+696
\| \|\
\| * \	Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache	Richard van der Hoff	2018-09-26	6	-187/+440
\| \|\ \
\| * \ \	Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache	Richard van der Hoff	2018-09-25	51	-62/+128
\| \|\ \ \
\| * \| \| \|	Fix ExpiringCache.__len__ to be accurate	Erik Johnston	2018-09-21	1	-12/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It used to try and produce an estimate, which was sometimes negative. This caused metrics to be sad, so lets always just calculate it from scratch.
\| * \| \| \|	Newsfile	Erik Johnston	2018-09-21	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add a five minute cache to get_destination_retry_timings	Erik Johnston	2018-09-21	2	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully helps with #3931
\| * \| \| \|	Make ExpiringCache slightly more performant	Erik Johnston	2018-09-21	1	-1/+5
\| \| \| \| \|
* \| \| \| \|	Further reduce the size of the docker image (#3972)	Richard van der Hoff	2018-10-01	2	-25/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need.
* \| \| \| \|	add --no-admin flag to registration script (#3836)	Bruno Windels	2018-09-28	2	-4/+15
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3964 from matrix-org/rav/remove_localhost_checks	Richard van der Hoff	2018-09-28	3	-30/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove spurious federation checks on localhost
\| * \| \| \| \|	Fix complete fail to do the right thing	Richard van der Hoff	2018-09-28	2	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	remove spurious federation checks on localhost	Richard van der Hoff	2018-09-26	1	-31/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's really no point in checking for destinations called "localhost" because there is nothing stopping people creating other DNS entries which point to 127.0.0.1. The right fix for this is https://github.com/matrix-org/synapse/issues/3953. Blocking localhost, on the other hand, means that you get a surprise when trying to connect a test server on localhost to an existing server (with a 'normal' server_name).
* \| \| \| \| \|	Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call	Richard van der Hoff	2018-09-28	2	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant call to start_get_pdu_cache
\| * \| \| \| \| \|	Remove redundant call to start_get_pdu_cache	Richard van der Hoff	2018-09-28	2	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I think this got forgotten in #3932. We were getting away with it because it was the last call in this function.
* / \| \| \| \|	build python 3 docker images on circle CI (#3976)	Jan Christian Grünhage	2018-09-28	2	-5/+12
\|/ / / / /
* \| \| \| \|	Merge pull request #3794 from matrix-org/erikj/faster_typing	Richard van der Hoff	2018-09-27	2	-3/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of getting typing updates for replication
\| * \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing	Erik Johnston	2018-09-19	177	-1345/+2545
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-19	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve performance of getting typing updates for replication	Erik Johnston	2018-09-05	1	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetching the list of all new typing notifications involved iterating over all rooms and comparing their serial. Lets move to using a stream change cache, like we do for other streams.
* \| \| \| \| \| \|	Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload	Richard van der Hoff	2018-09-27	2	-0/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build and push docker image to hub automatically
\| * \| \| \| \| \| \|	Do the changelog.d dance	Michael Kaye	2018-09-27	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make a ":latest" tag, and a SHA1 commit ID one too.	Michael Kaye	2018-09-27	1	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Latest is horrible and makes debugging what has happened anywhere a nightmare. We push a latest because of demand for it, but we'll also push a SHA1 commit id so those wanting to know what they're running (and be able to roll back if required) can use those instead. Note that latest here is defined as "most recent master commit" not "most recent released version", as the actual semantics of making latest correct while still being able to build bugfixed releases of previous versions is just ARGH. So we define it as "master" not "latest release".
\| * \| \| \| \| \| \|	Also, don't run this job on any branches	Michael Kaye	2018-09-27	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make username configurable in the UI too	Michael Kaye	2018-09-27	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix typo	Michael Kaye	2018-09-27	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Build and push docker image to hub	Michael Kaye	2018-09-27	1	-0/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups	Richard van der Hoff	2018-09-27	3	-4/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarifications in FederationHandler
\| * \| \| \| \| \| \| \|	more comments	Richard van der Hoff	2018-09-27	2	-6/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Clarifications in FederationHandler	Richard van der Hoff	2018-09-27	1	-2/+11
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add some comments on things that look a bit bogus * rename this `state` variable to avoid confusion with the `state` used elsewhere in this function. (There was no actual conflict, but it was a confusing bit of spaghetti.)
* \| \| \| \| \| \| \|	Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process	Amber Brown	2018-09-27	2	-2/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run notify_app_services as a bg process
\| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Run notify_app_services as a bg process	Richard van der Hoff	2018-09-26	1	-2/+6
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that its resource usage metrics get recorded somewhere rather than getting lost. (It also fixes an error when called from a nested logging context which completes before the bg process)
* \| \| \| \| \| \| \|	Merge pull request #3970 from schnuffle/develop-py3	Amber Brown	2018-09-27	19	-19/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced all occurences of e.message with str(e)
\| * \| \| \| \| \| \| \|	Update 3970.bugfix	Amber Brown	2018-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added changelog fragment	Schnuffle	2018-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Replaced all occurences of e.message with str(e)	Schnuffle	2018-09-27	18	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Schnuffle <schnuffle@github.com>
* \| \| \| \| \| \| \| \|	Run our oldest supported configuration in CI (#3952)	Amber Brown	2018-09-27	4	-13/+38
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts	Richard van der Hoff	2018-09-27	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	fix #3854 MAU transaction errors
\| * \| \| \| \| \| \| \|	towncrier	Neil Johnson	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix #3854	Neil Johnson	2018-09-26	1	-1/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2	Richard van der Hoff	2018-09-27	3	-2/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logging improvements
\| * \| \| \| \| \| \| \| \|	Logging improvements	Richard van der Hoff	2018-09-26	3	-2/+17
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some logging tweaks to help with debugging incoming federation transactions
* \| \| \| \| \| \| \| \|	Include eventid in log lines when processing incoming federation ↵	Richard van der Hoff	2018-09-27	6	-57/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines.
* \| \| \| \| \| \| \| \|	docstrings and unittests for storage.state (#3958)	Richard van der Hoff	2018-09-27	3	-8/+62
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I spent ages trying to figure out how I was going mad...
* \| \| \| \| \| \| \|	Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstring	Amber Brown	2018-09-27	2	-4/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	fix docstring for FederationClient.get_state_for_room
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix docstring for FederationClient.get_state_for_room	Richard van der Hoff	2018-09-26	1	-4/+4
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trivial fixes for docstring
* / / / / / /	Reduce the load on our CI (#3957)	Amber Brown	2018-09-27	3	-8/+30
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changelog * reduce circleci config * plus a handy script * fix regex
* \| \| \| \| \|	Merge branch 'develop' into rav/hacky_cache_factor_fix	Richard van der Hoff	2018-09-26	6	-315/+320
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len	Richard van der Hoff	2018-09-26	3	-20/+25
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|	Fix ExpiringCache.__len__ to be accurate
\| \| * \| \| \| \|	Log which cache is throwing exceptions	Richard van der Hoff	2018-09-26	1	-10/+17
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix ExpiringCache.__len__ to be accurate	Erik Johnston	2018-09-26	1	-10/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It used to try and produce an estimate, which was sometimes negative. This caused metrics to be sad, so lets always just calculate it from scratch. (This appears to have been a longstanding bug, but one which has been made more of a problem by #3932 and #3933). (This was originally done by Erik as part of #3933. I'm cherry-picking it because really it's a fix in its own right)
\| * \| \| \| \| \|	Merge pull request #3948 from matrix-org/rav/no_symlink_synctl	Amber Brown	2018-09-26	3	-285/+285
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move synctl into top dir to avoid a symlink
\| \| * \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-25	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Move synctl into top dir to avoid a symlink	Richard van der Hoff	2018-09-25	2	-285/+284
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	symlinks apparently break setuptools on python3 and alpine (https://bugs.python.org/issue31940), so let's stop using a symlink and just use the file directly.
* \| \| \| \| \| \| \|	Actuall set cache factors in workers	Erik Johnston	2018-09-26	1	-5/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu	Amber Brown	2018-09-26	3	-24/+48
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Comments and interface cleanup for on_receive_pdu
\| * \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-20	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Comments and interface cleanup for on_receive_pdu	Richard van der Hoff	2018-09-20	2	-24/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some informative comments about what's going on here. Also, `sent_to_us_directly` and `get_missing` were doing the same thing (apart from in `_handle_queued_pdus`, which looks like a bug), so let's get rid of `get_missing` and use `sent_to_us_directly` consistently.
* \| \| \| \| \| \|	Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3	Richard van der Hoff	2018-09-25	3	-2/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make python 3 work in the docker container
\| * \| \| \| \| \| \|	Update Dockerfile	Jan Christian Grünhage	2018-09-25	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update .dockerignore	Jan Christian Grünhage	2018-09-25	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add changelog	Jan Christian Grünhage	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	make python 3 work in the docker container	Jan Christian Grünhage	2018-09-20	3	-2/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update grafana dashboard	Richard van der Hoff	2018-09-25	1	-175/+417
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches	Richard van der Hoff	2018-09-25	17	-39/+13
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Fix some instances of ExpiringCache not expiring cache items
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-21	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix some instances of ExpiringCache not expiring cache items	Erik Johnston	2018-09-21	16	-39/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead.
* \| \| \| \| \| \|	added "media-src: 'self'" to CSP for resources (#3578)	Jérémy Farnaud	2018-09-25	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse doesn’t allow for media resources to be played directly from Chrome. It is a problem for users on other networks (e.g. IRC) communicating with Matrix users through a gateway. The gateway sends them the raw URL for the resource when a Matrix user uploads a video and the video cannot be played directly in Chrome using that URL. Chrome argues it is not authorized to play the video because of the Content Security Policy. Chrome checks for the "media-src" policy which is missing, and defauts to the "default-src" policy which is "none". As Synapse already sends "object-src: 'self'" I thought it wouldn’t be a problem to add "media-src: 'self'" to the CSP to fix this problem.
* \| \| \| \| \| \|	Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered	Richard van der Hoff	2018-09-25	2	-14/+36
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spurious exceptions when client closes conncetion
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix spurious exceptions when client closes conncetion	Erik Johnston	2018-09-20	1	-14/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a HTTP handler throws an exception while processing a request we automatically write a JSON error response. If the handler had already started writing a response twisted throws an exception. We should check for this case and simple abort the connection if there was an error after the response had started being written.
* \| \| \| \| \| \| \|	Merge pull request #3947 from matrix-org/rav/attr_version	Richard van der Hoff	2018-09-25	2	-1/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	We require attrs 16.0.0
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-25	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	We require attrs 16.0.0	Richard van der Hoff	2018-09-25	1	-1/+3
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ref: https://github.com/matrix-org/synapse/issues/3945
* \| \| \| \| \| \|	Only lazy load self-members on initial sync	Matthew Hodgson	2018-09-25	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline.
* \| \| \| \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-09-25	3	-3/+13
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge tag 'v0.33.5.1'	Amber Brown	2018-09-25	3	-3/+13
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internal Changes ---------------- - Fix incompatibility with older Twisted version in tests. Thanks @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940))
\| \| * \| \| \| \| \| \|	changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1	Amber Brown	2018-09-25	2	-2/+10
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	bump version	Amber Brown	2018-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	changelog for 3940	Amber Brown	2018-09-25	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix compatibility issue with older Twisted in tests.	Oleg Girko	2018-09-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Older Twisted (18.4.0) returns TimeoutError instead of ConnectingCancelledError when connection times out. This change allows tests to be compatible with this behaviour. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-09-24	42	-40/+65
\|\\| \| \| \| \| \| \| \| \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge tag 'v0.33.5'	Amber Brown	2018-09-24	87	-1091/+1998
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Features -------- - Python 3.5 and 3.6 support is now in beta. ([\#3576](https://github.com/matrix-org/synapse/issues/3576)) - Implement `event_format` filter param in `/sync` ([\#3790](https://github.com/matrix-org/synapse/issues/3790)) - Add synapse_admin_mau:registered_reserved_users metric to expose number of real reaserved users ([\#3846](https://github.com/matrix-org/synapse/issues/3846)) Bugfixes -------- - Remove connection ID for replication prometheus metrics, as it creates a large number of new series. ([\#3788](https://github.com/matrix-org/synapse/issues/3788)) - guest users should not be part of mau total ([\#3800](https://github.com/matrix-org/synapse/issues/3800)) - Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted. ([\#3804](https://github.com/matrix-org/synapse/issues/3804)) - Fix existing room tags not coming down sync when joining a room ([\#3810](https://github.com/matrix-org/synapse/issues/3810)) - Fix jwt import check ([\#3824](https://github.com/matrix-org/synapse/issues/3824)) - fix VOIP crashes under Python 3 (#3821) ([\#3835](https://github.com/matrix-org/synapse/issues/3835)) - Fix manhole so that it works with latest openssh clients ([\#3841](https://github.com/matrix-org/synapse/issues/3841)) - Fix outbound requests occasionally wedging, which can result in federation breaking between servers. ([\#3845](https://github.com/matrix-org/synapse/issues/3845)) - Show heroes if room name/canonical alias has been deleted ([\#3851](https://github.com/matrix-org/synapse/issues/3851)) - Fix handling of redacted events from federation ([\#3859](https://github.com/matrix-org/synapse/issues/3859)) - ([\#3874](https://github.com/matrix-org/synapse/issues/3874)) - Mitigate outbound federation randomly becoming wedged ([\#3875](https://github.com/matrix-org/synapse/issues/3875)) Internal Changes ---------------- - CircleCI tests now run on the potential merge of a PR. ([\#3704](https://github.com/matrix-org/synapse/issues/3704)) - http/ is now ported to Python 3. ([\#3771](https://github.com/matrix-org/synapse/issues/3771)) - Improve human readable error messages for threepid registration/account update ([\#3789](https://github.com/matrix-org/synapse/issues/3789)) - Make /sync slightly faster by avoiding needless copies ([\#3795](https://github.com/matrix-org/synapse/issues/3795)) - handlers/ is now ported to Python 3. ([\#3803](https://github.com/matrix-org/synapse/issues/3803)) - Limit the number of PDUs/EDUs per federation transaction ([\#3805](https://github.com/matrix-org/synapse/issues/3805)) - Only start postgres instance for postgres tests on Travis CI ([\#3806](https://github.com/matrix-org/synapse/issues/3806)) - tests/ is now ported to Python 3. ([\#3808](https://github.com/matrix-org/synapse/issues/3808)) - crypto/ is now ported to Python 3. ([\#3822](https://github.com/matrix-org/synapse/issues/3822)) - rest/ is now ported to Python 3. ([\#3823](https://github.com/matrix-org/synapse/issues/3823)) - add some logging for the keyring queue ([\#3826](https://github.com/matrix-org/synapse/issues/3826)) - speed up lazy loading by 2-3x ([\#3827](https://github.com/matrix-org/synapse/issues/3827)) - Improved Dockerfile to remove build requirements after building reducing the image size. ([\#3834](https://github.com/matrix-org/synapse/issues/3834)) - Disable lazy loading for incremental syncs for now ([\#3840](https://github.com/matrix-org/synapse/issues/3840)) - federation/ is now ported to Python 3. ([\#3847](https://github.com/matrix-org/synapse/issues/3847)) - Log when we retry outbound requests ([\#3853](https://github.com/matrix-org/synapse/issues/3853)) - Removed some excess logging messages. ([\#3855](https://github.com/matrix-org/synapse/issues/3855)) - Speed up purge history for rooms that have been previously purged ([\#3856](https://github.com/matrix-org/synapse/issues/3856)) - Refactor some HTTP timeout code. ([\#3857](https://github.com/matrix-org/synapse/issues/3857)) - Fix running merged builds on CircleCI ([\#3858](https://github.com/matrix-org/synapse/issues/3858)) - Fix typo in replication stream exception. ([\#3860](https://github.com/matrix-org/synapse/issues/3860)) - Add in flight real time metrics for Measure blocks ([\#3871](https://github.com/matrix-org/synapse/issues/3871)) - Disable buffering and automatic retrying in treq requests to prevent timeouts. ([\#3872](https://github.com/matrix-org/synapse/issues/3872)) - mention jemalloc in the README ([\#3877](https://github.com/matrix-org/synapse/issues/3877)) - Remove unmaintained "nuke-room-from-db.sh" script ([\#3888](https://github.com/matrix-org/synapse/issues/3888))
\| \| * \| \| \| \| \|	towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5	Amber Brown	2018-09-24	1	-0/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	update version	Amber Brown	2018-09-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	changelog v0.33.5rc1	Amber Brown	2018-09-17	41	-39/+58
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	update python 3 changelog	Amber Brown	2018-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	version	Amber Brown	2018-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3927 from matrix-org/erikj/handle_background_errors	Erik Johnston	2018-09-21	2	-0/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle exceptions thrown by background tasks
\| * \| \| \| \| \| \| \|	Add missing logger	Erik Johnston	2018-09-20	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Handle exceptions thrown by background tasks	Erik Johnston	2018-09-20	1	-0/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3921
* \| \| \| \| \| \| \|	Always LL ourselves if we're in a room to simplify clients (#3916)	Matthew Hodgson	2018-09-20	2	-0/+5
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Should fix https://github.com/vector-im/riot-web/issues/7209
* \| \| \| \| \| \|	Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links	Neil Johnson	2018-09-20	2	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Neilj/fix room invite mail links
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	Richard van der Hoff	2018-09-18	31	-98/+351
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neilj/fix_room_invite_mail_links
\| * \| \| \| \| \| \|	towncrier	Neil Johnson	2018-09-13	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix link for case that config.email_riot_base_url is set	Neil Johnson	2018-09-13	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix client IPs being broken on Python 3 (#3908)	Amber Brown	2018-09-20	9	-58/+238
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3914 from matrix-org/erikj/remove_retry_cache	Erik Johnston	2018-09-20	2	-8/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove get_destination_retry_timings cache
\| * \| \| \| \| \| \|	Fix up changelog and remove spurious comment	Erik Johnston	2018-09-19	2	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	pep8	Erik Johnston	2018-09-19	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-19	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove get_destination_retry_timings cache	Erik Johnston	2018-09-19	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Add a way to run tests in PostgreSQL in Docker (#3699)	Amber Brown	2018-09-20	8	-9/+79
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add a regression test for logging on failed connections (#3912)	Amber Brown	2018-09-20	4	-5/+77
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Improve the logging when handling a federation transaction (#3904)	Richard van der Hoff	2018-09-19	3	-56/+111
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \|	Merge pull request #3910 from matrix-org/erikj/update_timeout	Erik Johnston	2018-09-19	5	-87/+52
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Update to use new timeout function everywhere.
\| * \| \| \| \| \|	Fixup	Erik Johnston	2018-09-19	2	-4/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Replace custom DeferredTimeoutError with defer.TimeoutError	Erik Johnston	2018-09-19	2	-12/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Run canceller first to allow it to generate correct error	Erik Johnston	2018-09-19	1	-2/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-19	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update to use new timeout function everywhere.	Erik Johnston	2018-09-19	4	-72/+43
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	update changelog for #3909	Richard van der Hoff	2018-09-19	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3909 from turt2live/travis/fix-logging-1	Amber Brown	2018-09-19	2	-4/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix matrixfederationclient.py logging: Destination is a string
\| * \| \| \| \| \|	Changelog	Travis Ralston	2018-09-18	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Destination is a string	Travis Ralston	2018-09-18	1	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove documentation referencing Cygwin (#3873)	Amber Brown	2018-09-19	3	-31/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name	Amber Brown	2018-09-19	2	-3/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set SNI to the server_name, not whatever was in the SRV record
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-18	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Set SNI to the server_name, not whatever was in the SRV record	Richard van der Hoff	2018-09-18	1	-3/+10
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3843
* \| \| \| \| \| \|	Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout	Amber Brown	2018-09-19	2	-1/+31
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Bump timeout on get_missing_events request
\| * \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-18	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump timeout on get_missing_events request	Richard van der Hoff	2018-09-18	1	-1/+30
\| \|/ / / / /
* \| \| \| \| \|	Use directory server for room joins (#3899)	Richard van der Hoff	2018-09-18	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we do a join, always try the server we used for the alias lookup first. Fixes #2418
* \| \| \| \| \|	Refactor matrixfederationclient to fix logging (#3906)	Richard van der Hoff	2018-09-18	5	-186/+359
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Merge pull request #3894 from matrix-org/hs/phone_home_py_version	Amber Brown	2018-09-19	2	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Add python_version phone home stat
\| * \| \| \| \|	Create 3894.feature	Will Hunt	2018-09-17	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	typo	Will Hunt	2018-09-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	make pip happy?	Will Hunt	2018-09-17	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Use a string for versions	Will Hunt	2018-09-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add python_version phone home stat	Will Hunt	2018-09-17	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3879 from matrix-org/matthew/fix-autojoin	Richard van der Hoff	2018-09-18	2	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't ratelimit autojoins
\| * \| \| \| \| \|	changelog	Matthew Hodgson	2018-09-15	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	don't ratelimit autojoins	Matthew Hodgson	2018-09-15	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3882 from SimmyD/max_upload_docker_var	Richard van der Hoff	2018-09-18	3	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add variable for changing the max upload size in Docker container
\| * \| \| \| \| \| \|	Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.	Simon Dwyer	2018-09-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon Dwyer <simon@thedwyers.co>
\| * \| \| \| \| \| \|	Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.	Simon Dwyer	2018-09-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.	Simon Dwyer	2018-09-16	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added 'MAX_UPLOAD_SIZE' variable and set default to "10M"	Simon Dwyer	2018-09-16	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias	Richard van der Hoff	2018-09-18	3	-4/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a 404 when deleting unknown room alias
\| * \| \| \| \| \| \|	Reinstate missing null check	Richard van der Hoff	2018-09-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Return a 404 when deleting unknown room alias	Richard van der Hoff	2018-09-17	2	-4/+16
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per https://github.com/matrix-org/matrix-doc/issues/1675 Fixes https://github.com/matrix-org/synapse/issues/2782
* \| \| \| \| \| \|	Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics	Richard van der Hoff	2018-09-18	3	-12/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix more b'abcd' noise in metrics
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix more b'abcd' noise in metrics	Richard van der Hoff	2018-09-17	2	-12/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3897 from aaronraimist/synaspse-typo	Richard van der Hoff	2018-09-18	2	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in README, synaspse -> synapse
\| * \| \| \| \| \| \| \|	Add changelog	Aaron Raimist	2018-09-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \| \| \| \| \|	Fix typo in README, synaspse -> synapse	Aaron Raimist	2018-09-17	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| / / / /	Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logs	Richard van der Hoff	2018-09-17	3	-5/+9
\|\\| \| \| \| \| \| \| \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Fix some b'abcd' noise in logs and metrics
\| * \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-17	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix some b'abcd' noise in logs and metrics	Richard van der Hoff	2018-09-17	2	-5/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Python 3 compatibility: make sure that we decode some byte sequences before we use them to create log lines and metrics labels.
* / / / / /	README: run python_dependencies with -m	Richard van der Hoff	2018-09-17	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	... to stop things which try to import `types` getting `synapse.types` instead
* \| \| \| \|	Merge pull request #3888 from matrix-org/rav/nuke_nuke_rooms	Amber Brown	2018-09-17	2	-57/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Remove nuke-room-from-db.sh script
\| * \| \| \|	changelog	Richard van der Hoff	2018-09-17	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Remove nuke-room-from-db.sh script	Richard van der Hoff	2018-09-17	1	-57/+0
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem with this script is that it is largely untested, entirely unmaintained, and running it is likely to make your synapse blow up in exciting ways. For example, it leaves a bunch of tables with dead values in it, like event_to_state_groups. Having it here sends a message that it is a supported part of synapse, which is absolutely not the case.
* \| \| \|	missing changelog	Matthew Hodgson	2018-09-15	1	-0/+1
\| \| \| \|
* \| \| \|	mention libjemalloc in readme (#3877)	Vincent Breitmoser	2018-09-15	1	-0/+8
\| \| \| \|
* \| \| \|	Fix timeout function	Erik Johnston	2018-09-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out deferred.cancel sometimes throws, so we do that last to ensure that we always do resolve the new deferred.
* \| \| \|	Merge pull request #3875 from matrix-org/erikj/extra_timeouts	Erik Johnston	2018-09-14	3	-0/+63
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add an awful secondary timeout to fix wedged requests
\| * \| \| \|	Newsfile	Erik Johnston	2018-09-14	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add an awful secondary timeout to fix wedged requests	Erik Johnston	2018-09-14	2	-0/+62
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	This is an attempt to mitigate #3842 by adding yet-another-timeout
* \| \| \|	don't filter membership events based on history visibility (#3874)	Matthew Hodgson	2018-09-14	2	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't filter membership events based on history visibility as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so.
* \| \| \|	Merge pull request #3872 from matrix-org/hawkowl/timeouts-2	Erik Johnston	2018-09-14	5	-7/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	timeouts 2: electric boogaloo
\| * \| \| \|	fix	Amber Brown	2018-09-15	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	changelog	Amber Brown	2018-09-15	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	fix	Amber Brown	2018-09-14	1	-1/+4
\| \| \| \| \|
\| * \| \| \|	fix	Amber Brown	2018-09-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	redact better	Amber Brown	2018-09-14	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	we do that higher up	Amber Brown	2018-09-14	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2	Amber Brown	2018-09-14	8	-61/+55
\| \|\\| \| \|
\| * \| \| \|	buffer?	Amber Brown	2018-09-14	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics	Erik Johnston	2018-09-14	5	-4/+217
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add in flight real time metrics for Measure blocks
\| * \| \| \| \|	Remove spurious comment	Erik Johnston	2018-09-14	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Measure outbound requests	Erik Johnston	2018-09-14	1	-3/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Tests	Erik Johnston	2018-09-14	1	-0/+81
\| \| \| \| \| \|
\| * \| \| \| \|	Add in flight real time metrics for Measure blocks	Erik Johnston	2018-09-14	2	-1/+131
\|/ / / / /
* \| \| \| \|	Merge pull request #3860 from matrix-org/travis/typo-1	Travis Ralston	2018-09-13	2	-1/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Fix minor typo in exception
\| * \| \| \|	Create 3860.misc	Travis Ralston	2018-09-13	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix minor typo in exception	Travis Ralston	2018-09-13	1	-1/+1
\|/ / / /
* / / /	merge (#3576)	Amber Brown	2018-09-14	8	-61/+55
\|/ / /
* \| \|	Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8	Erik Johnston	2018-09-13	2	-16/+29
\|\ \ \ \| \| \| \| \| \| \| \|	Make purge history slightly faster
\| * \| \|	comment	Erik Johnston	2018-09-13	1	-0/+2
\| \| \| \|
\| * \| \|	pep8	Erik Johnston	2018-09-13	1	-1/+0
\| \| \| \|
\| * \| \|	Create indices after insertion	Erik Johnston	2018-09-13	1	-14/+18
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-09-13	4	-2/+28
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/speed_up_purge
\| * \| \| \|	Newsfile	Erik Johnston	2018-09-13	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Make purge history slightly faster	Erik Johnston	2018-09-13	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't pull out events that are outliers and won't be deleted, as nothing should happen to them.
* \| \| \| \|	Merge pull request #3859 from matrix-org/erikj/add_iterkeys	Amber Brown	2018-09-14	3	-1/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix handling of redacted events from federation
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-13	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix handling of redacted events from federation	Erik Johnston	2018-09-13	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we receive an event that doesn't pass their content hash check (e.g. due to already being redacted) then we hit a bug which causes an exception to be raised, which then promplty stops the event (and request) from being processed. This effects all sorts of federation APIs, including joining rooms with a redacted state event.
* \| \| \| \| \|	fix circleci merged builds (#3858)	Amber Brown	2018-09-14	2	-0/+5
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* fix * changelog
* \| / / /	Attempt to figure out what's going on with timeouts (#3857)	Amber Brown	2018-09-14	4	-57/+241
\| \|/ / / \|/\| \| \|
* \| \| \|	Remove some superfluous logging (#3855)	Amber Brown	2018-09-13	4	-2/+28
\|/ / /
* \| \|	Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7	Neil Johnson	2018-09-12	4	-3/+60
\|\ \ \ \| \| \| \| \| \| \| \|	expose number of real reserved users
\| * \| \|	improve naming	Neil Johnson	2018-09-12	4	-10/+14
\| \| \| \|
\| * \| \|	towncrier	Neil Johnson	2018-09-12	1	-0/+1
\| \| \| \|
\| * \| \|	expose number of real reserved users	Neil Johnson	2018-09-12	3	-3/+55
\| \| \| \|
* \| \| \|	show heroes if a room has a 'deleted' name/canonical_alias (#3851)	Matthew Hodgson	2018-09-12	2	-2/+16
\| \| \| \|
* \| \| \|	Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time	Erik Johnston	2018-09-12	2	-75/+75
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Log outbound requests when we retry
\| * \| \| \|	Newsfile	Erik Johnston	2018-09-12	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Log outbound requests when we retry	Erik Johnston	2018-09-12	1	-75/+74
\| \| \| \| \|
* \| \| \| \|	argh pep8	Matthew Hodgson	2018-09-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	correctly log gappy sync metrics	Matthew Hodgson	2018-09-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	fix logline	Matthew Hodgson	2018-09-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3841 from matrix-org/erikj/manhole_key_length	Erik Johnston	2018-09-12	2	-13/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change the manhole SSH key to have more bits
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-11	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Change the manhole SSH key to have more bits	Erik Johnston	2018-09-11	1	-13/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Newer versions of openssh client refuse to connect to the old key due to its length.
* \| \| \| \| \|	Add JUnit summaries to CircleCI as well as merged runs (#3704)	Amber Brown	2018-09-12	3	-0/+94
\| \| \| \| \| \|
* \| \| \| \| \|	Port federation/ to py3 (#3847)	Amber Brown	2018-09-12	4	-19/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3835 from krombel/fix_3821	Amber Brown	2018-09-12	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix VOIP crashes under Python 3
\| * \| \| \| \| \|	add changelog	Krombel	2018-09-10	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix VOIP crashes under Python 3 (#3821)	Krombel	2018-09-10	1	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3826 from matrix-org/rav/logging_for_keyring	Amber Brown	2018-09-12	4	-13/+47
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add some logging for the keyring queue
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-07	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	clearer logging when things fail, too	Richard van der Hoff	2018-09-06	2	-7/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add some logging for the keyring queue	Richard van der Hoff	2018-09-06	1	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	why is it so damn slow?
* \| \| \| \| \| \| \|	Merge pull request #3824 from matrix-org/rav/fix_jwt_import	Amber Brown	2018-09-12	3	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix jwt import check
\| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-07	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix jwt import check	Richard van der Hoff	2018-09-07	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This handy code attempted to check that we could import jwt, but utterly failed to check it was the right jwt. Fixes https://github.com/matrix-org/synapse/issues/3793
* \| \| \| \| \| \| \| \|	Port rest/ to Python 3 (#3823)	Amber Brown	2018-09-12	18	-100/+113
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Port crypto/ to Python 3 (#3822)	Amber Brown	2018-09-12	4	-6/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3845 from matrix-org/erikj/timeout_reads	Amber Brown	2018-09-12	2	-7/+46
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	Timeout reading body for outbound HTTP requests
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-12	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Timeout reading body for outbound HTTP requests	Erik Johnston	2018-09-12	1	-7/+45
\|/ / / / / / /
* \| \| \| / / /	Speed up lazy loading (#3827)	Matthew Hodgson	2018-09-12	5	-30/+159
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840)
* \| \| \| \| \|	Merge pull request #3834 from mvgorcum/develop	Erik Johnston	2018-09-10	2	-10/+17
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Remove build requirements after building docker image
\| * \| \| \| \|	add runtime dependencies	Jan Christian Grünhage	2018-09-10	1	-5/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Newsfile	Mathijs van Gorcum	2018-09-10	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move COPY before RUN and merge RUNs	Mathijs van Gorcum	2018-09-10	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Remove build requirements after building	Mathijs van Gorcum	2018-09-10	1	-2/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join	Amber Brown	2018-09-07	2	-0/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Send existing room tags down sync on join
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-06	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Don't send empty tags list down sync	Erik Johnston	2018-09-06	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Send existing room tags down sync on join	Erik Johnston	2018-09-06	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync.
* \| \| \| \| \|	Merge pull request #3783 from cwmke/develop	Richard van der Hoff	2018-09-07	1	-0/+12
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Add apache vhost config to Readme
\| * \| \| \| \|	Remove end '/'s	Colin W	2018-09-02	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Update readme on develop branch	Colin W	2018-09-02	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-09-07	29	-28/+61
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	changelog v0.33.4 github/release-v0.33.4 release-v0.33.4	Amber Brown	2018-09-07	2	-1/+9
\| \| \| \| \| \|
\| * \| \| \| \|	version	Amber Brown	2018-09-07	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2	Erik Johnston	2018-09-06	0	-0/+0
\| \|\ \ \ \ \