9681 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	7ab2b69e18	Avoid locking pushers table on upsert ... Now that _simple_upsert will retry on IntegrityError, we don't need to lock the table.	2017-11-16 15:32:01 +00:00
Richard van der Hoff	10aaa1bc15	_simple_upsert: retry on IntegrityError ... wrap the call to _simple_upsert_txn in a loop so that we retry on an integrityerror: this means we can avoid locking the table provided there is an unique index.	2017-11-16 15:30:15 +00:00
Richard van der Hoff	cdc9e50a5d	Cleanup in _simple_upsert_txn ... Bail out early to reduce indentation	2017-11-16 15:29:10 +00:00
Richard van der Hoff	f959c01600	Merge pull request #2661 from matrix-org/rav/statereadstore ... Pull out bits of StateStore to a mixin	2017-11-15 17:23:01 +00:00
Richard van der Hoff	117a8c0d35	Merge pull request #2677 from matrix-org/rav/spec_r0.3.0 ... Declare support for r0.3.0	2017-11-15 17:10:45 +00:00
Richard van der Hoff	30d2730ee2	Declare support for r0.3.0	2017-11-15 16:24:22 +00:00
Erik Johnston	aa812feb41	Merge branch 'master' of github.com:matrix-org/synapse into develop	2017-11-15 11:35:34 +00:00
Erik Johnston	552f123bea	Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse	2017-11-15 11:32:24 +00:00
Erik Johnston	5d0cbf763f	Bump changelog	2017-11-15 11:29:32 +00:00
Richard van der Hoff	1b83c09c03	Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs ... Remove preserve_context_over_{fn, deferred}	2017-11-15 11:13:53 +00:00
David Baker	7190a550dc	Merge pull request #2650 from matrix-org/dbkr/push_include_content_option ... Rename redact_content option to include_content	2017-11-15 10:47:38 +00:00
Richard van der Hoff	b2cd6accf5	Remove __PreservingContextDeferred too	2017-11-14 23:00:10 +00:00
Richard van der Hoff	038c994724	Merge pull request #2648 from krombel/update_prometheus ... update prometheus-config to new format	2017-11-14 19:14:32 +00:00
Krombel	c161472575	Make clear that the config has changed since prometheus v2 ... This restores the config that is usable for prometheus pre v2.0.0 The new config only works for Prometheus v2+	2017-11-14 19:59:26 +01:00
Richard van der Hoff	008aa2fc6d	Merge pull request #2671 from matrix-org/rav/room_list_fixes ... Reshuffle room list request code	2017-11-14 18:11:02 +00:00
Richard van der Hoff	6f30fd9235	Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups ... Add new boolean columns to port script	2017-11-14 16:03:41 +00:00
Erik Johnston	9ecf621404	Less s's	2017-11-14 15:55:15 +00:00
Erik Johnston	22db751d1e	Add new boolean columns to port script	2017-11-14 15:48:50 +00:00
Erik Johnston	03feb7a34d	Bump version and changelog	2017-11-14 14:51:25 +00:00
Richard van der Hoff	35a4b63240	Pull out bits of StateStore to a mixin ... ... so that we don't need to secretly gut-wrench it for use in the slaved stores. I haven't done the other stores yet, but we should. I'm tired of the workers breaking every time we tweak the stores because I forgot to gut-wrench the right method. fixes https://github.com/matrix-org/synapse/issues/2655.	2017-11-14 11:43:58 +00:00
Richard van der Hoff	4dd1bfa8c1	Revert "Revert "move _state_group_cache to statestore"" ... We're going to fix this properly on this branch, so that the _state_group_cache can end up in StateGroupReadStore. This reverts commit ab335edb02.	2017-11-14 11:43:58 +00:00
Richard van der Hoff	6caa379ba1	Merge pull request #2658 from matrix-org/rav/store_heirarchy_init ... Make __init__ consistent across Store hierarchy	2017-11-14 11:43:12 +00:00
Richard van der Hoff	7e6fa29cb5	Remove preserve_context_over_{fn, deferred} ... Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off.	2017-11-14 11:22:42 +00:00
Richard van der Hoff	44a1bfd6a6	Reshuffle room list request code ... I'm not entirely sure if this will actually help anything, but it simplifies the code and might give further clues about why room list search requests are blowing out the get_current_state_ids caches.	2017-11-14 10:29:58 +00:00
Richard van der Hoff	1fc66c7460	Add a load of logging to the room_list handler ... So we can see what it gets up to.	2017-11-14 10:23:47 +00:00
Richard van der Hoff	7bd6c87eca	Merge pull request #2668 from turt2live/travis/whoami ... Add a route for determining who you are	2017-11-14 09:54:21 +00:00
Travis Ralston	812c191939	Remove redundent call ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 12:44:21 -07:00
Richard van der Hoff	c741ba59c9	Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failure ... Cache failures in url_preview handler	2017-11-13 18:36:24 +00:00
Richard van der Hoff	781c15a6a3	Merge pull request #2663 from matrix-org/rav/invalid_request_utf8 ... Fix 500 on invalid utf-8 in request	2017-11-13 18:35:24 +00:00
David Baker	45ab288e07	Print instead of logging ... because we had to wait until the logger was set up	2017-11-13 18:32:08 +00:00
Richard van der Hoff	8b33ac8f6c	Merge branch 'develop' into rav/invalid_request_utf8	2017-11-13 11:56:22 +00:00
Richard van der Hoff	63ef607f1f	Fix tests for Store.__init__ update ... Fix the test to pass the right number of args to the Store constructors	2017-11-13 10:46:08 +00:00
Richard van der Hoff	6cfee09be9	Make __init__ consitstent across Store heirarchy ... Add db_conn parameters to the `__init__` methods of the *Store classes, so that they are all consistent, which makes the multiple inheritance work correctly (and so that we can later extract mixins which can be used in the slavedstores)	2017-11-13 10:46:07 +00:00
Erik Johnston	ab335edb02	Revert "move _state_group_cache to statestore" ... This reverts commit f5cf3638e9.	2017-11-13 10:05:33 +00:00
Erik Johnston	bfbf1e1f1a	Up cache size of get_global_account_data_by_type_for_user	2017-11-13 09:52:11 +00:00
Travis Ralston	2d314b771f	Add a route for determining who you are ... Useful for applications which may have an access token, but no idea as to who owns it. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-12 23:39:38 -07:00
Richard van der Hoff	5d15abb120	Bit more logging	2017-11-10 16:58:04 +00:00
Richard van der Hoff	46790f50cf	Cache failures in url_preview handler ... Reshuffle the caching logic in the url_preview handler so that failures are cached (and to generally simplify things and fix the logcontext leaks).	2017-11-10 16:50:50 +00:00
Richard van der Hoff	4d0414c714	Merge pull request #2662 from matrix-org/rav/fix_mxids_again ... Downcase userid on registration	2017-11-10 13:57:34 +00:00
Richard van der Hoff	e508145c9b	Add some more comments appservice user registration ... Explain why we don't validate userids registered via app services	2017-11-10 12:39:45 +00:00
Richard van der Hoff	e0ebd1e4bd	Downcase userids for shared-secret registration	2017-11-10 12:39:05 +00:00
Richard van der Hoff	f90649eb2b	Fix 500 on invalid utf-8 in request ... If somebody sends us a request where the the body is invalid utf-8, we should return a 400 rather than a 500. (json.loads throws a UnicodeError in this situation) We might as well catch all Exceptions here: it seems very unlikely that we would get a request that *isn't caused by invalid json.	2017-11-10 09:15:39 +00:00
Richard van der Hoff	9b599bc18d	Downcase userid on registration ... Force username to lowercase before attempting to register https://github.com/matrix-org/synapse/issues/2660	2017-11-09 22:20:01 +00:00
Richard van der Hoff	9b803ccc98	Revert "Allow upper-case characters in mxids" ... This reverts commit b70b646903.	2017-11-09 21:57:24 +00:00
Richard van der Hoff	1282086f58	Merge pull request #2659 from matrix-org/rav/apparently_we_dont_follow_our_own_spec_now ... Allow upper-case characters in mxids	2017-11-09 20:06:47 +00:00
Richard van der Hoff	b70b646903	Allow upper-case characters in mxids ... Because we're never going to be able to fix this :'(	2017-11-09 19:36:13 +00:00
Erik Johnston	2dce6b15c3	Fix typo	2017-11-09 15:56:16 +00:00
Erik Johnston	4e2b2508af	Register group servlet	2017-11-09 15:49:42 +00:00
Luke Barnard	0ea5310290	Merge pull request #2657 from matrix-org/erikj/group_visibility_namespace ... Namespace visibility options for groups	2017-11-09 15:41:51 +00:00
Erik Johnston	13735843c7	Namespace visibility options for groups	2017-11-09 15:27:18 +00:00