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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Part deactivated users in the background	David Baker	2018-05-09	2	-1/+61
\| \| \| \| \|	One room at a time so we don't take out the whole server with leave events, and restart at server restart.
*	Part user from rooms on account deactivate	David Baker	2018-05-08	1	-1/+15
\| \| \| \| \| \| \|	This implements this very crudely: this probably isn't viable because parting a user from all their rooms could take a long time, and if the HS gets restarted in that time the process will be aborted.
*	Merge pull request #3190 from mujx/notif-token-fix	Richard van der Hoff	2018-05-08	1	-1/+1
\|\ \| \| \| \|	notifications: Convert next_token to string according to the spec
\| *	notifications: Convert next_token to string according to the spec	Konstantinos Sideris	2018-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Currently the parameter is serialized as an integer. Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
* \|	Note that label values can be anything	Erik Johnston	2018-05-03	1	-1/+2
\| \|
* \|	Fix metrics that have integer value labels	Erik Johnston	2018-05-03	1	-1/+1
\|/
*	Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail	Richard van der Hoff	2018-05-03	137	-1294/+2609
\|\
\| *	Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks	Richard van der Hoff	2018-05-03	1	-3/+14
\| \|\ \| \| \| \| \| \|	Fix logcontext leaks in rate limiter
\| \| *	Fix logcontext leaks in rate limiter	Richard van der Hoff	2018-05-03	1	-3/+14
\| \| \|
\| * \|	Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown	Richard van der Hoff	2018-05-03	1	-3/+8
\| \|\ \ \| \| \| \| \| \| \| \|	Fix 'Unhandled Error' logs with Twisted 18.4
\| \| * \|	Don't abortConnection() if the transport connection has already closed.	Will Hunt	2018-05-03	1	-3/+8
\| \| \| \|
\| * \| \|	Merge pull request #3178 from matrix-org/rav/fix_request_timeouts	Richard van der Hoff	2018-05-03	1	-1/+1
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	fix http request timeout code
\| \| * \|	add missing param to cancelled_to_request_timed_out_error	Richard van der Hoff	2018-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gets two arguments, not one.
\| * \| \|	Merge pull request #3141 from matrix-org/erikj/fixup_state	Erik Johnston	2018-05-03	1	-37/+67
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor event storage to prepare for changes in state calculations
\| \| * \| \|	Fix up grammar	Erik Johnston	2018-05-03	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	Refactor event storage to not require state	Erik Johnston	2018-04-27	1	-37/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in preparation for using contexts that may or may not have the current_state_ids set. This will allow us to avoid unnecessarily pulling out state for an event on the master process when using workers. We also add a check to see if the state groups of the old extremities are the same as the new ones.
\| * \| \| \|	Merge pull request #3161 from NotAFile/remove-v1auth	Richard van der Hoff	2018-05-03	3	-12/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make Client-Server API return 403 for invalid token
\| \| * \| \| \|	Burminate v1auth	Adrian Tschira	2018-04-30	3	-12/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \|	Merge pull request #3175 from matrix-org/erikj/escape_metric_values	Erik Johnston	2018-05-03	1	-2/+28
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Escape label values in prometheus metrics
\| \| * \| \| \|	Make _escape_character take MatchObject	Erik Johnston	2018-05-02	1	-2/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Escape label values in prometheus metrics	Erik Johnston	2018-05-02	1	-2/+20
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks	Richard van der Hoff	2018-05-02	1	-22/+38
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a class of logcontext leaks
\| \| * \| \| \| \|	Merge branch 'develop' into rav/more_logcontext_leaks	Richard van der Hoff	2018-05-02	2	-2/+2
\| \| \|\\| \| \| \|
\| \| * \| \| \| \|	Fix a class of logcontext leaks	Richard van der Hoff	2018-05-02	1	-22/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So, it turns out that if you have a first `Deferred` `D1`, you can add a callback which returns another `Deferred` `D2`, and `D2` must then complete before any further callbacks on `D1` will execute (and later callbacks on `D1` get the result of `D2` rather than `D2` itself). So, `D1` might have `called=True` (as in, it has started running its callbacks), but any new callbacks added to `D1` won't get run until `D2` completes - so if you `yield D1` in an `inlineCallbacks` function, your `yield` will 'block'. In conclusion: some of our assumptions in `logcontext` were invalid. We need to make sure that we don't optimise out the logcontext juggling when this situation happens. Fortunately, it is easy to detect by checking `D1.paused`.
\| * \| \| \| \| \|	Fix logcontext leak in media repo	Richard van der Hoff	2018-05-02	2	-1/+4
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make FileResponder.write_to_consumer uphold the logcontext contract
\| * \| \| \| \|	Merge pull request #3168 from matrix-org/rav/fix_logformatter	Richard van der Hoff	2018-05-02	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect reference to StringIO
\| \| * \| \| \| \|	Fix incorrect reference to StringIO	Richard van der Hoff	2018-05-02	1	-1/+1
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was introduced in 4f2f5171
\| * \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-05-01	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Update __init__.py	Neil Johnson	2018-05-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bump version
\| * \| \| \| \|	Merge branch 'release-v0.28.1' into develop	Richard van der Hoff	2018-05-01	3	-4/+26
\| \|\\| \| \| \| \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Merge commit '33f469b' into release-v0.28.1	Richard van der Hoff	2018-05-01	3	-4/+26
\| \| \|\ \ \
\| \| \| * \| \|	Apply some limits to depth to counter abuse	Richard van der Hoff	2018-05-01	3	-4/+26
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* When creating a new event, cap its depth to 2^63 - 1 * When receiving events, reject any without a sensible depth As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI
\| \| * / /	Miscellaneous fixes to python_dependencies	Richard van der Hoff	2018-05-01	1	-1/+19
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)
\| * \| \|	Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)	Will Hunt	2018-04-30	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #3135 Signed-off-by: Will Hunt will@half-shot.uk
\| * \| \|	add guard for None on purge_history api	Krombel	2018-04-30	1	-1/+14
\| \| \| \|
\| * \| \|	Merge pull request #3129 from matrix-org/matthew/fix_group_dups	Matthew Hodgson	2018-04-30	1	-0/+57
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	remove duplicates from groups tables
\| \| * \| \|	fix missing import	Matthew Hodgson	2018-04-28	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	pep8	Matthew Hodgson	2018-04-28	1	-3/+5
\| \| \| \| \|
\| \| * \| \|	make it work with sqlite	Matthew Hodgson	2018-04-28	2	-34/+54
\| \| \| \| \|
\| \| * \| \|	remove duplicates from groups tables	Matthew Hodgson	2018-04-25	1	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and rename inconsistently named indexes. Based on https://github.com/matrix-org/synapse/pull/3128 - thanks @vurpo\!
\| * \| \| \|	Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn	Richard van der Hoff	2018-04-30	1	-4/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant call to preserve_fn
\| \| * \| \| \|	Remove redundant call to preserve_fn	Richard van der Hoff	2018-04-30	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	submit_event_for_as doesn't return a deferred anyway, so this is pointless.
\| * \| \| \| \|	Merge pull request #3144 from ↵	Richard van der Hoff	2018-04-30	1	-1/+7
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/run_in_background_exception_handling Trap exceptions thrown within run_in_background
\| \| * \| \| \| \|	Trap exceptions thrown within run_in_background	Richard van der Hoff	2018-04-27	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turn any exceptions that get thrown synchronously within run_in_background into Failures instead.
\| * \| \| \| \| \|	Merge pull request #3102 from NotAFile/py3-attributeerror	Richard van der Hoff	2018-04-30	1	-3/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make event properties raise AttributeError instead
\| \| * \| \| \| \| \|	add comment explaining attributeerror	Adrian Tschira	2018-04-30	1	-0/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Make event properties raise AttributeError instead	Adrian Tschira	2018-04-15	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They raised KeyError before. I'm changing this because the code uses hasattr() to check for the presence of a key. This worked accidentally before, because hasattr() silences all exceptions in python 2. However, in python3, this isn't the case anymore. I had a look around to see if anything depended on this raising a KeyError and I couldn't find anything. Of course, I could have simply missed it. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \|	Merge pull request #3152 from NotAFile/py3-local-imports	Richard van der Hoff	2018-04-30	4	-7/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make imports local
\| \| * \| \| \| \| \| \|	make imports local	Adrian Tschira	2018-04-28	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \|	Merge pull request #3153 from NotAFile/py3-httplib	Richard van der Hoff	2018-04-30	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move httplib import to six
\| \| * \| \| \| \| \| \| \|	move httplib import to six	Adrian Tschira	2018-04-28	1	-3/+3
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Merge pull request #3151 from NotAFile/py3-xrange-1	Richard van der Hoff	2018-04-30	9	-11/+28
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move more xrange to six
\| \| * \ \ \ \ \ \ \	Merge branch 'develop' into py3-xrange-1	Richard van der Hoff	2018-04-30	39	-110/+143
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Move more xrange to six	Adrian Tschira	2018-04-28	9	-11/+28
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plus a bonus next() Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \|	Merge pull request #3150 from NotAFile/py3-listcomp-yield	Richard van der Hoff	2018-04-30	1	-5/+9
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|	Don't yield in list comprehensions
\| \| * \| \| \| \| \| \| \|	Don't yield in list comprehensions	Adrian Tschira	2018-04-28	1	-5/+9
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I've tried to grep for more of this with no success. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \|	Merge pull request #3085 from NotAFile/py3-config-text-mode	Richard van der Hoff	2018-04-30	2	-4/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open config file in non-bytes mode
\| \| * \| \| \| \| \| \| \|	open log_config in text mode too	Adrian Tschira	2018-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| \| * \| \| \| \| \| \| \|	Open config file in non-bytes mode	Adrian Tschira	2018-04-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nothing written into it is encoded, so it makes little sense, but it does break in python3 the way it was before. The variable names were adjusted to be less misleading. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \|	Merge pull request #3084 from NotAFile/py3-certs-byte-mode	Richard van der Hoff	2018-04-30	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open certificate files as bytes
\| \| * \| \| \| \| \| \| \| \|	Open certificate files as bytes	Adrian Tschira	2018-04-10	1	-2/+2
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That's what pyOpenSSL expects on python3 Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \|	Merge pull request #3154 from NotAFile/py3-stringio	Richard van der Hoff	2018-04-30	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|	Replace stringIO imports with six
\| \| * \| \| \| \| \| \| \|	replace stringIO imports	Adrian Tschira	2018-04-28	2	-3/+3
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #3155 from NotAFile/py3-bytes-1	Richard van der Hoff	2018-04-30	4	-7/+10
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more bytes strings
\| \| * \| \| \| \| \| \| \|	more bytes strings	Adrian Tschira	2018-04-29	4	-7/+10
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \|	Merge pull request #3140 from matrix-org/rav/use_run_in_background	Richard van der Hoff	2018-04-30	22	-72/+98
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use run_in_background in preference to preserve_fn
\| \| * \| \| \| \| \| \| \|	pep8; remove spurious import	Richard van der Hoff	2018-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background	Richard van der Hoff	2018-04-27	26	-257/+388
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Use run_in_background in preference to preserve_fn	Richard van der Hoff	2018-04-27	22	-71/+97
\| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object.
\| * \| \| \| \| \| \| \| \|	Merge pull request #3156 from NotAFile/py3-hmac-bytes	Richard van der Hoff	2018-04-30	2	-11/+15
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Construct HMAC as bytes on py3
\| \| * \| \| \| \| \| \| \| \|	Construct HMAC as bytes on py3	Adrian Tschira	2018-04-29	2	-11/+15
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \|	Merge pull request #3108 from NotAFile/py3-six-urlparse	Richard van der Hoff	2018-04-30	6	-11/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|	Use six.moves.urlparse
\| \| * \| \| \| \| \| \| \|	Use six.moves.urlparse	Adrian Tschira	2018-04-15	6	-11/+11
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout	Richard van der Hoff	2018-04-27	26	-257/+388
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge pull request #3142 from matrix-org/rav/reraise	Richard van der Hoff	2018-04-27	2	-13/+24
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reraise exceptions more carefully
\| \| \| * \| \| \| \| \| \|	reraise exceptions more carefully	Richard van der Hoff	2018-04-27	2	-13/+24
\| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to be careful (under python 2, at least) that when we reraise an exception after doing some error handling, we actually reraise the original exception rather than anything that might have been raised (and handled) during the error handling.
\| \| * \| \| \| \| \| \|	Merge pull request #3136 from matrix-org/rav/fix_dependencies	Richard van der Hoff	2018-04-27	1	-1/+19
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Miscellaneous fixes to python_dependencies
\| \| \| * \| \| \| \| \| \|	Miscellaneous fixes to python_dependencies	Richard van der Hoff	2018-04-26	1	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)
\| \| * \| \| \| \| \| \| \|	Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions	Richard van der Hoff	2018-04-27	20	-237/+335
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve exception handling for background processes
\| \| \| * \| \| \| \| \| \| \|	Improve exception handling for background processes	Richard van der Hoff	2018-04-27	20	-237/+335
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background.
\| \| * \| \| \| \| \| \| \|	Merge pull request #3139 from matrix-org/rav/consume_errors	Richard van der Hoff	2018-04-27	3	-5/+9
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \|	Add missing consumeErrors to improve exception handling
\| \| \| * \| \| \| \| \| \|	Add missing consumeErrors	Richard van der Hoff	2018-04-27	3	-5/+9
\| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In general we want defer.gatherResults to consumeErrors, rather than having exceptions hanging around and getting logged as CRITICAL unhandled errors.
\| \| * / / / / / /	update changelog and bump version to 0.28.0 v0.28.0 github/release-v0.28.0-rc1 release-v0.28.0-rc1	Neil Johnson	2018-04-26	1	-1/+1
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'develop' into rav/deferred_timeout	Richard van der Hoff	2018-04-27	5	-14/+99
\| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix media admin APIs	Erik Johnston	2018-04-26	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Also fix reindexing of search	Erik Johnston	2018-04-25	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix quarantine media admin API	Erik Johnston	2018-04-25	1	-1/+1
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Bump version and update changelog v0.28.0-rc1	Neil Johnson	2018-04-24	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #3118 from matrix-org/rav/reject_prev_events	Richard van der Hoff	2018-04-23	2	-9/+94
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|	Reject events which have lots of prev_events
\| \| \| * \| \| \|	Remove spurious param	Richard van der Hoff	2018-04-23	1	-1/+0
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	accept stupid events over backfill	Richard van der Hoff	2018-04-20	1	-4/+9
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add some comments	Richard van der Hoff	2018-04-18	2	-5/+35
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Check events on backfill too	Richard van der Hoff	2018-04-18	1	-15/+42
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Reject events which have too many auth_events or prev_events	Richard van der Hoff	2018-04-18	1	-4/+28
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... this should protect us from being dossed by people making silly events (deliberately or otherwise)
\| * \| \| \| \|	Backport deferred.addTimeout	Richard van der Hoff	2018-04-27	5	-14/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Twisted 16.0 doesn't have addTimeout, so let's backport it.
\| * \| \| \| \|	Use deferred.addTimeout instead of time_bound_deferred	Richard van der Hoff	2018-04-23	5	-97/+59
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This doesn't feel like a wheel we need to reinvent.
\| * \| \| \|	Merge pull request #3106 from NotAFile/py3-six-itervalues-1	Richard van der Hoff	2018-04-20	4	-11/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use six.itervalues in some places
\| \| * \| \| \|	Use six.itervalues in some places	Adrian Tschira	2018-04-15	4	-11/+18
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's more where that came from Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \|	Merge pull request #3107 from NotAFile/py3-bool-nonzero	Richard van der Hoff	2018-04-20	3	-0/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	add __bool__ alias to __nonzero__ methods
\| \| * \| \| \|	add __bool__ alias to __nonzero__ methods	Adrian Tschira	2018-04-15	3	-0/+9
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \|	Merge pull request #3110 from NotAFile/py3-six-queue	Richard van der Hoff	2018-04-20	2	-4/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Replace Queue with six.moves.queue
\| \| * \| \| \|	Replace Queue with six.moves.queue	Adrian Tschira	2018-04-16	2	-4/+6
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and a six.range change which I missed the last time Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \|	Merge pull request #3103 from NotAFile/py3-baseexcepton-message	Richard van der Hoff	2018-04-20	1	-4/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use str(e) instead of e.message
\| \| * \| \| \|	Use str(e) instead of e.message	Adrian Tschira	2018-04-15	1	-4/+4
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doing this I learned e.message was pretty shortlived, added in 2.6, they realized it was a bad idea and deprecated it in 2.7 Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \|	Merge pull request #3093 from matrix-org/rav/response_cache_wrap	Richard van der Hoff	2018-04-20	6	-79/+111
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor ResponseCache usage
\| \| * \| \| \|	Reinstate linearizer for federation_server.on_context_state_request	Richard van der Hoff	2018-04-20	1	-5/+11
\| \| \| \| \| \|
\| \| * \| \| \|	ResponseCache: fix handling of completed results	Richard van der Hoff	2018-04-13	1	-13/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that ObservableDeferred.observe doesn't return a deferred if the result is already completed. Fix handling and improve documentation.
\| \| * \| \| \|	Refactor ResponseCache usage	Richard van der Hoff	2018-04-12	6	-67/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a `.wrap` method to ResponseCache which wraps up the boilerplate of a (get, set) pair, and then use it throughout the codebase. This will be largely non-functional, but does include the following functional changes: * federation_server.on_context_state_request: drops use of _server_linearizer which looked redundant and could cause incorrect cache misses by yielding between the get and the set. * RoomListHandler.get_remote_public_room_list(): fixes logcontext leaks * the wrap function includes some logging. I'm hoping this won't be too noisy on production.
\| * \| \| \| \|	Merge pull request #3117 from matrix-org/rav/refactor_have_events	Richard van der Hoff	2018-04-20	3	-27/+55
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor store.have_events
\| \| * \| \| \| \|	Refactor store.have_events	Richard van der Hoff	2018-04-20	3	-27/+55
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turns out that most of the time we were calling have_events, we were only using half of the result. Replace have_events with have_seen_events and get_rejection_reasons, so that we can see what's going on a bit more clearly.
\| * / \| \| \|	Avoid creating events with huge numbers of prev_events	Richard van der Hoff	2018-04-16	3	-54/+94
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In most cases, we limit the number of prev_events for a given event to 10 events. This fixes a particular code path which created events with huge numbers of prev_events.
\| * \| \| \|	Merge branch 'master' of https://github.com/matrix-org/synapse into develop	Neil Johnson	2018-04-13	2	-2/+2
\| \|\ \ \ \
\| \| * \| \| \|	Bump version and Change log v0.27.4 github/release-v0.27.0 release-v0.27.0	Neil Johnson	2018-04-13	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Bump canonicaljson to 1.1.3	Richard van der Hoff	2018-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1.1.2 was a bit broken too :/
\| \| * \| \| \|	Update canonicaljson dependency	Richard van der Hoff	2018-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1.1.0 and 1.1.1 were broken, so we're updating this to help people make sure they don't end up on a broken version. Also, 1.1.0 is speedier...
\| * \| \| \| \|	fix federation_domain_whitelist	Matthew Hodgson	2018-04-13	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we were checking the wrong server_name on inbound requests
\| * \| \| \| \|	revert last to PR properly	Matthew Hodgson	2018-04-13	1	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	correctly auth inbound federation_domain_whitelist reqs	Matthew Hodgson	2018-04-13	1	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://github.com/matrix-org/synapse into develop	Neil Johnson	2018-04-13	1	-1/+1
\| \|\\| \| \| \|
\| \| * \| \| \|	bump version/changelog	Neil Johnson	2018-04-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge commit '11d2609da70af797405241cdf7d9df19db5628f2' of ↵	Neil Johnson	2018-04-11	1	-48/+80
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/matrix-org/synapse into release-v0.27.0
\| * \| \| \| \| \|	Revert "Use sortedcontainers instead of blist"	Richard van der Hoff	2018-04-13	3	-10/+10
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9fbe70a7dc3afabfdac176ba1f4be32dd44602aa. It turns out that sortedcontainers.SortedDict is not an exact match for blist.sorteddict; in particular, `popitem()` removes things from the opposite end of the dict. This is trivial to fix, but I want to add some unit tests, and potentially some more thought about it, before we do so.
\| * \| \| \| \|	Merge pull request #3092 from matrix-org/rav/response_cache_metrics	Richard van der Hoff	2018-04-12	6	-7/+21
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics for ResponseCache
\| \| * \| \| \| \|	Add metrics for ResponseCache	Richard van der Hoff	2018-04-10	6	-7/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Format docstring	Erik Johnston	2018-04-12	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-04-12	2	-2/+51
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/processed_event_lag
\| \| * \ \ \ \ \	Merge pull request #3059 from matrix-org/rav/doc_response_cache	Richard van der Hoff	2018-04-12	1	-0/+32
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the behaviour of ResponseCache
\| \| \| * \| \| \| \| \|	Document the behaviour of ResponseCache	Richard van der Hoff	2018-04-04	1	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it looks like everything that uses ResponseCache expects to have to `make_deferred_yieldable` its results. It's debatable whether that is the best approach, but let's document it for now to avoid further confusion.
\| \| * \| \| \| \| \| \|	Merge pull request #3088 from matrix-org/erikj/as_parallel	Erik Johnston	2018-04-12	1	-2/+19
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send events to ASes concurrently
\| \| \| * \| \| \| \| \| \|	Send events to ASes concurrently	Erik Johnston	2018-04-11	1	-2/+19
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Doc we raise on unknown event	Erik Johnston	2018-04-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	s/list/tuple	Erik Johnston	2018-04-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Set all metrics at the same time	Erik Johnston	2018-04-12	2	-10/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Track last processed event received_ts	Erik Johnston	2018-04-11	4	-0/+52
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Track where event stream processing have gotten up to	Erik Johnston	2018-04-11	4	-0/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add GaugeMetric	Erik Johnston	2018-04-11	2	-1/+38
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge pull request #2760 from Valodim/pypy	Richard van der Hoff	2018-04-11	7	-13/+24
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse on PyPy
\| \| * \| \| \| \| \| \| \|	Don't disable GC when running on PyPy	Vincent Breitmoser	2018-04-10	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PyPy's incminimark GC can't be triggered manually. From what I observed there are no obvious issues with just letting it run normally. And unlike CPython, it actually returns unused RAM to the system. Signed-off-by: Vincent Breitmoser <look@my.amazin.horse>
\| \| * \| \| \| \| \| \| \|	In DomainSpecificString, override __repr__ in addition to __str__	Vincent Breitmoser	2018-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For some reason, string interpolation on a DomainSpecificString object like "%r" % (domainSpecificStringObj) fails under PyPy, because the default __repr__ implementation wants to iterate over the object. I'm not sure why that happens, but overriding __repr__ instead of __str__ fixes this problem, and is arguably the more appropriate thing to do anyways.
\| \| * \| \| \| \| \| \| \|	Fix pep8 error on psycopg2cffi hack	Richard van der Hoff	2018-04-10	1	-6/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Use psycopg2cffi module instead of psycopg2 if running on pypy	Vincent Breitmoser	2018-04-10	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The psycopg2 package isn't available for PyPy. This commit adds a check if the runtime is PyPy, and if it is uses psycopg2cffi module in favor of psycopg2. This is almost a drop-in replacement, except for one place where an additional cast to string is required.
\| \| * \| \| \| \| \| \| \|	Use sortedcontainers instead of blist	Vincent Breitmoser	2018-04-10	3	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit drop-in replaces blist with SortedContainers. They are written in pure python so work with pypy, but perform as good as native implementations, at least in a couple benchmarks: http://www.grantjenks.com/docs/sortedcontainers/performance.html
\| * \| \| \| \| \| \| \| \|	fix typo	Neil Johnson	2018-04-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends	Erik Johnston	2018-04-10	2	-55/+56
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit concurrent event sends for a room
\| \| * \| \| \| \| \| \| \| \|	Note why we're limiting concurrent event sends	Erik Johnston	2018-04-10	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Limit concurrent event sends for a room	Erik Johnston	2018-04-09	1	-49/+50
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Use create_and_send_nonmember_event everywhere	Erik Johnston	2018-04-09	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3078 from matrix-org/erikj/federation_sender	Erik Johnston	2018-04-10	1	-15/+41
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|	Send federation events concurrently
\| \| * \| \| \| \| \| \| \| \|	Use run_in_background instead	Erik Johnston	2018-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Preserve log contexts correctly	Erik Johnston	2018-04-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Log event ID on exception	Erik Johnston	2018-04-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Handle all events in a room correctly	Erik Johnston	2018-04-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Send federation events concurrently	Erik Johnston	2018-04-09	1	-4/+18
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Handle exceptions in get_hosts_for_room when sending events over federation	Erik Johnston	2018-04-09	1	-11/+16
\| \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-04-10	2	-7/+7
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| / / / \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|	develop
\| \| * \| \| \| \| \| \|	remove errant print v0.27.3-rc2	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix msec to sec, again	Neil Johnson	2018-04-09	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix msec to sec	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix psycopg2 interpolation	Neil Johnson	2018-04-09	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	version bump v0.27.3-rc2	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-04-09	31	-151/+613
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.27.0
\| \| * \| \| \| \| \| \| \|	bump version to release candidate	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	bump version v0.27.3-rc1	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #3082 from matrix-org/erikj/urlencode_paths	Erik Johnston	2018-04-10	1	-48/+80
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| / / \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|	URL quote path segments over federation
\| \| * \| \| \| \| \| \|	Ensure slashes are escaped	Erik Johnston	2018-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	URL quote path segments over federation	Erik Johnston	2018-04-10	1	-48/+80
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #2996 from krombel/allow_auto_join_rooms	Richard van der Hoff	2018-04-10	2	-34/+34
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|	move handling of auto_join_rooms to RegisterHandler
\| \| * \| \| \| \| \|	Merge branch 'develop' of into allow_auto_join_rooms	Krombel	2018-03-28	48	-101/+155
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	move handling of auto_join_rooms to RegisterHandler	Krombel	2018-03-14	2	-34/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de>
\| * \| \| \| \| \| \| \|	Merge pull request #3061 from NotAFile/add-some-byte-strings	Richard van der Hoff	2018-04-09	5	-13/+13
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add b prefixes to some strings that are bytes in py3
\| \| * \| \| \| \| \| \| \|	Add b prefixes to some strings that are bytes in py3	Adrian Tschira	2018-04-04	5	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \|	Merge pull request #3073 from NotAFile/use-six-reraise	Richard van der Hoff	2018-04-09	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace old-style raise with six.reraise
\| \| * \| \| \| \| \| \| \| \|	Replace old-style raise with six.reraise	Adrian Tschira	2018-04-06	1	-1/+3
\| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old style raise is invalid syntax in python3. As noted in the docs, this adds one more frame in the traceback, but I think this is acceptable: <ipython-input-7-bcc5cba3de3f> in <module>() 16 except: 17 pass ---> 18 six.reraise(*x) /usr/lib/python3.6/site-packages/six.py in reraise(tp, value, tb) 691 if value.__traceback__ is not tb: 692 raise value.with_traceback(tb) --> 693 raise value 694 finally: 695 value = None <ipython-input-7-bcc5cba3de3f> in <module>() 9 10 try: ---> 11 x() 12 except: 13 x = sys.exc_info() Also note that this uses six, which is not formally a dependency yet, but is included indirectly since most packages depend on it. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \|	Merge pull request #2938 from dklug/develop	Richard van der Hoff	2018-04-09	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return 401 for invalid access_token on logout
\| \| * \| \| \| \| \| \| \| \|	Return 401 for invalid access_token on logout	dklug	2018-03-02	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Duncan Klug <dklug@ucmerced.edu>
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3074 from NotAFile/fix-py3-prints	Richard van der Hoff	2018-04-09	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use python3-compatible prints
\| \| * \| \| \| \| \| \| \| \| \|	use python3-compatible prints	Adrian Tschira	2018-04-06	1	-5/+5
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3075 from NotAFile/six-type-checks	Richard van der Hoff	2018-04-09	3	-6/+12
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace some type checks with six type checks
\| \| * \| \| \| \| \| \| \| \| \|	Replace some type checks with six type checks	Adrian Tschira	2018-04-07	3	-6/+12
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3016 from silkeh/improve-service-lookups	Richard van der Hoff	2018-04-09	1	-95/+8
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve handling of SRV records for federation connections
\| \| * \| \| \| \| \| \| \| \| \|	Remove address resolution of hosts in SRV records	Silke	2018-04-04	1	-95/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Silke Hofstra <silke@slxh.eu>
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin	Richard van der Hoff	2018-04-09	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Return a 404 rather than a 500 on rejoining empty rooms
\| \| * \| \| \| \| \| \| \| \| \|	Return a 404 rather than a 500 on rejoining empty rooms	Richard van der Hoff	2018-04-09	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter ourselves out of the server list before checking for an empty remote host list, to fix 500 error Fixes #2141
\| * \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics"	Richard van der Hoff	2018-04-09	2	-0/+51
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We aren't ready to release this yet, so I'm reverting it for now. This reverts commit d1679a4ed7947b0814e0f2af9b888a16c588f1a1, reversing changes made to e089100c6231541c446e37e157dec8feed02d283.
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3046 from matrix-org/dbkr/join_group	Luke Barnard	2018-04-06	5	-25/+133
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement group join API
\| \| * \| \| \| \| \| \| \| \| \|	de-lint, quote consistency	Luke Barnard	2018-04-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Explicitly grab individual columns from group object	Luke Barnard	2018-04-06	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	When exposing group state, return is_openly_joinable	Luke Barnard	2018-04-06	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as opposed to join_policy, which is really only pertinent to the synapse implementation of the group server. By doing this we keep the group server concept extensible by allowing arbitrarily complex rules for deciding whether a group is openly joinable.
\| \| * \| \| \| \| \| \| \| \| \|	By default, join policy is "invite"	Luke Barnard	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	add_user -> _add_user	Luke Barnard	2018-04-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	pep8	Luke Barnard	2018-04-06	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Get group_info from existing call to check_group_is_ours	Luke Barnard	2018-04-06	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Don't use redundant inlineCallbacks	Luke Barnard	2018-04-06	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	join_rule -> join_policy	Luke Barnard	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	is_joinable -> join_rule	Luke Barnard	2018-04-06	2	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Fix federation client `set_group_joinable` typo	Luke Barnard	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Factor out add_user from accept_invite and join_group	Luke Barnard	2018-04-06	1	-41/+29
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	pep8	David Baker	2018-04-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Implement group join API	David Baker	2018-04-06	5	-4/+124
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add response size metrics	Erik Johnston	2018-04-06	1	-0/+7
\| \|/ / / / / / / / / /
\| * / / / / / / / / /	use PUT instead of POST for federating groups/m.join_policy	Krombel	2018-04-06	3	-3/+7
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	more verbosity in synctl	Richard van der Hoff	2018-04-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #2986 from jplatte/join_reponse_room_id	Richard van der Hoff	2018-04-05	1	-1/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add room_id to the response of `rooms/{roomId}/join`
\| \| * \| \| \| \| \| \| \| \|	Add room_id to the response of `rooms/{roomId}/join`	Jonas Platte	2018-03-13	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2349
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3068 from matrix-org/rav/fix_cache_invalidation	Richard van der Hoff	2018-04-05	1	-26/+38
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve database cache performance
\| \| * \| \| \| \| \| \| \| \| \|	Fix overzealous cache invalidation	Richard van der Hoff	2018-04-05	1	-26/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes an issue where a cache invalidation would invalidate all pending entries, rather than just the entry that we intended to invalidate.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics	Richard van der Hoff	2018-04-05	2	-51/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant metrics which were deprecated in 0.27.0.
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove redundant metrics which were deprecated in 0.27.0.	Richard van der Hoff	2018-04-04	2	-51/+0
\| \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #3045 from matrix-org/dbkr/group_joinable	Luke Barnard	2018-04-05	8	-0/+157
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add joinability for groups
\| \| * \| \| \| \| \| \| \| \| \| \|	NON NULL -> NOT NULL	Luke Barnard	2018-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Use "/settings/" (plural)	Luke Barnard	2018-04-05	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Use DEFAULT join_policy of "invite" in db	Luke Barnard	2018-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Document set_group_join_policy	Luke Barnard	2018-04-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Use join_policy API instead of joinable	Luke Barnard	2018-04-03	7	-23/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open".
\| \| * \| \| \| \| \| \| \| \| \| \|	This should probably be a PUT	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	OK, smallint it is then	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Grr. Copy the definition from is_admin	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2018-03-28	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Make column definition that works on both dbs	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Add schema delta file	David Baker	2018-03-28	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Add joinability for groups	David Baker	2018-03-28	7	-1/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds API to set the 'joinable' flag, and corresponding flag in the table.
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3041 from matrix-org/r30_stats	Neil Johnson	2018-04-05	5	-7/+115
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	R30 stats
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Review comments	Neil Johnson	2018-04-05	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use iteritems over item to loop over dict formatting
\| \| * \| \| \| \| \| \| \| \| \| \| \|	pep8	Neil Johnson	2018-03-29	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove need for sqlite specific query	Neil Johnson	2018-03-29	1	-30/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	fix pep8 errors	Neil Johnson	2018-03-28	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	remove twisted deferral cruft	Neil Johnson	2018-03-28	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	bump schema version	Neil Johnson	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Support multi client R30 for psql	Neil Johnson	2018-03-28	2	-9/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	rename stat to future proof	Neil Johnson	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add user_ips last seen index	Neil Johnson	2018-03-28	2	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	No need to cast in count_daily_users	Neil Johnson	2018-03-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	query and call for r30 stats	Neil Johnson	2018-03-28	2	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	count_daily_users failed if db was sqlite due to type failure - presumably ↵	Neil Johnson	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this prevcented all sqlite homeservers reporting home
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3060 from matrix-org/rav/kill_event_content	Richard van der Hoff	2018-04-05	3	-7/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Remove uses of events.content
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove uses of events.content	Richard van der Hoff	2018-03-29	3	-7/+12
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	phone home cache size configurations	Jan Christian Grünhage	2018-04-04	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "improve mxid check performance"	Richard van der Hoff	2018-04-04	1	-4/+3
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #3000 from NotAFile/change-except-style	Richard van der Hoff	2018-04-04	2	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace old style error catching with 'as' keyword
\| \| * \| \| \| \| \| \| \| \| \| \|	replace old style error catching with 'as' keyword	NotAFile	2018-03-15	2	-5/+5
\| \| \| \|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is both easier to read and compatible with python3 (not that that matters) Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #3044 from matrix-org/michaelk/performance_stats	Richard van der Hoff	2018-04-04	1	-0/+33
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add basic performance statistics to phone home
\| \| * \| \| \| \| \| \| \| \| \| \|	Handle review comments	Michael Kaye	2018-03-28	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	As daemonizing will make a new process, defer call to init.	Michael Kaye	2018-03-28	1	-13/+23
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Include coarse CPU and Memory use in stats callbacks.	Michael Kaye	2018-03-27	1	-0/+20
\| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This requires the psutil module, and is still opt-in based on the report_stats config option.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #3053 from NotAFile/speedup-mxid-check	Richard van der Hoff	2018-04-04	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	improve mxid check performance
\| \| * \| \| \| \| \| \| \| \| \|	improve mxid check performance ~4x	Adrian Tschira	2018-03-31	1	-3/+4
\| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #3049 from matrix-org/rav/use_staticjson	Richard van der Hoff	2018-04-03	4	-20/+34
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use static JSONEncoders
\| \| * \| \| \| \| \| \| \| \| \|	Fix json encoding bug in replication	Richard van der Hoff	2018-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	json encoders have an encode method, not a dumps method.
\| \| * \| \| \| \| \| \| \| \| \|	Use static JSONEncoders	Richard van der Hoff	2018-03-29	4	-20/+34
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using json.dumps with custom options requires us to create a new JSONEncoder on each call. It's more efficient to create one upfront and reuse it.
\| * / / / / / / / / /	Use simplejson throughout	Richard van der Hoff	2018-03-29	3	-5/+9
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's use simplejson rather than json, for consistency.