12224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Neil Johnson	2dadc092b8	move logic into register, fix room alias localpart bug, tests	2018-10-04 17:00:27 +01:00
Matthew Hodgson	faa462ef79	changelog	2018-09-29 02:21:01 +01:00
Matthew Hodgson	23b6a0537f	emit room aliases event	2018-09-29 02:19:37 +01:00
Matthew Hodgson	5b68f29f48	fix thinkos	2018-09-29 02:14:40 +01:00
Matthew Hodgson	8f646f2d04	fix UTs	2018-09-28 15:37:28 +01:00
Matthew Hodgson	07340cdaca	untested stab at autocreating autojoin rooms	2018-09-28 01:42:53 +01:00
Richard van der Hoff	36c62a67c4	Merge pull request #3794 from matrix-org/erikj/faster_typing ... Improve performance of getting typing updates for replication	2018-09-27 15:14:26 +01:00
Richard van der Hoff	b5c976347b	Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload ... Build and push docker image to hub automatically	2018-09-27 15:07:41 +01:00
Richard van der Hoff	e1e3e77bfd	Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups ... Clarifications in FederationHandler	2018-09-27 15:06:59 +01:00
Amber Brown	6de3884e5e	Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process ... Run notify_app_services as a bg process	2018-09-27 23:40:30 +10:00
Amber Brown	a512e637ac	Merge pull request #3970 from schnuffle/develop-py3 ... Replaced all occurences of e.message with str(e)	2018-09-27 23:39:45 +10:00
Amber Brown	b3064532d0	Run our oldest supported configuration in CI (#3952)	2018-09-27 23:21:54 +10:00
Amber Brown	861c063ebc	Update 3970.bugfix	2018-09-27 22:47:01 +10:00
Schnuffle	a873896096	Added changelog fragment	2018-09-27 14:01:44 +02:00
Schnuffle	dc5db01ff2	Replaced all occurences of e.message with str(e) ... Signed-off-by: Schnuffle <schnuffle@github.com>	2018-09-27 13:38:50 +02:00
Richard van der Hoff	51d33d5178	Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts ... fix #3854 MAU transaction errors	2018-09-27 12:31:37 +01:00
Michael Kaye	74bbdd0412	Do the changelog.d dance	2018-09-27 12:01:43 +01:00
Michael Kaye	8607397ea7	Make a ":latest" tag, and a SHA1 commit ID one too. ... 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".	2018-09-27 12:01:41 +01:00
Michael Kaye	a3c11f7320	Also, don't run this job on any branches	2018-09-27 12:01:09 +01:00
Michael Kaye	73a089f461	Make username configurable in the UI too	2018-09-27 12:00:40 +01:00
Michael Kaye	3852c2bc39	Fix typo	2018-09-27 12:00:01 +01:00
Michael Kaye	0d36fe3563	Build and push docker image to hub	2018-09-27 11:59:17 +01:00
Richard van der Hoff	28223841e0	more comments	2018-09-27 11:31:51 +01:00
Richard van der Hoff	ad8e137062	changelog	2018-09-27 11:31:51 +01:00
Richard van der Hoff	e3c159863d	Clarifications in FederationHandler ... * 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.)	2018-09-27 11:31:51 +01:00
Richard van der Hoff	92abd3d6d6	Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 ... Logging improvements	2018-09-27 11:27:46 +01:00
Richard van der Hoff	4a15a3e4d5	Include eventid in log lines when processing incoming federation 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.	2018-09-27 11:25:34 +01:00
Richard van der Hoff	ae6ad4cf41	docstrings and unittests for storage.state (#3958) ... I spent ages trying to figure out how I was going mad...	2018-09-27 11:22:25 +01:00
Amber Brown	2c695fd1aa	Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstring ... fix docstring for FederationClient.get_state_for_room	2018-09-27 18:06:38 +10:00
Richard van der Hoff	e70b4ce069	Logging improvements ... Some logging tweaks to help with debugging incoming federation transactions	2018-09-26 17:36:14 +01:00
Richard van der Hoff	3c37c7e45b	changelog	2018-09-26 17:01:30 +01:00
Richard van der Hoff	a87d419a85	Run notify_app_services as a bg process ... 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)	2018-09-26 17:00:40 +01:00
Richard van der Hoff	ab59f3d8da	changelog	2018-09-26 16:52:24 +01:00
Richard van der Hoff	607eec0456	fix docstring for FederationClient.get_state_for_room ... trivial fixes for docstring	2018-09-26 16:52:24 +01:00
Neil Johnson	d514608b5c	towncrier	2018-09-26 16:19:53 +01:00
Neil Johnson	28781b65e7	fix #3854	2018-09-26 16:16:41 +01:00
Amber Brown	d4e0861ff9	Reduce the load on our CI (#3957) ... * changelog * reduce circleci config * plus a handy script * fix regex	2018-09-27 00:23:21 +10:00
Richard van der Hoff	bf01efb864	Merge branch 'develop' into rav/hacky_cache_factor_fix	2018-09-26 13:24:07 +01:00
Erik Johnston	8834396b8a	Actuall set cache factors in workers	2018-09-26 13:23:02 +01:00
Richard van der Hoff	4e8276a34a	Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len ... Fix ExpiringCache.__len__ to be accurate	2018-09-26 13:10:13 +01:00
Richard van der Hoff	7ee94fc1ba	Log which cache is throwing exceptions	2018-09-26 12:43:08 +01:00
Amber Brown	66a1d57adb	Merge pull request #3948 from matrix-org/rav/no_symlink_synctl ... Move synctl into top dir to avoid a symlink	2018-09-26 21:41:58 +10:00
Amber Brown	c2185f14d7	Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu ... Comments and interface cleanup for on_receive_pdu	2018-09-26 21:41:26 +10:00
Richard van der Hoff	8ac9fa7375	changelog	2018-09-26 12:35:10 +01:00
Erik Johnston	3baf6e1667	Fix ExpiringCache.__len__ to be accurate ... 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)	2018-09-26 12:32:29 +01:00
Richard van der Hoff	f65163627f	Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3 ... make python 3 work in the docker container	2018-09-25 15:18:09 +01:00
Jan Christian Grünhage	df55a943ca	Update Dockerfile	2018-09-25 14:33:38 +02:00
Jan Christian Grünhage	e7fa032126	Update .dockerignore	2018-09-25 14:33:19 +02:00
Richard van der Hoff	0649306fde	Update grafana dashboard	2018-09-25 13:29:28 +01:00
Richard van der Hoff	4c3e7eeec5	Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches ... Fix some instances of ExpiringCache not expiring cache items	2018-09-25 12:02:57 +01:00