12431 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard van der Hoff	ef771cc4c2	Fix a number of flake8 errors ... Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there.	2018-10-24 10:39:03 +01:00
Richard van der Hoff	e0b9d5f0af	Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts ... Clean up the way logcontexts and threads work in the pushers	2018-10-24 09:53:57 +01:00
Erik Johnston	cb23aa4c42	Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation ... Clean up room alias creation	2018-10-24 09:40:27 +01:00
Richard van der Hoff	c573794b22	Fix start_pushers vs _start_pushers confusion	2018-10-24 09:24:55 +01:00
Richard van der Hoff	e564306e31	sanity-check the is_processing flag ... ... and rename it, for even more sanity	2018-10-24 09:23:33 +01:00
Travis Ralston	43c3f0b02f	Merge pull request #3969 from turt2live/travis/fix-federated-group-requests ... Handle HttpResponseException more safely for federated groups	2018-10-23 10:41:04 -06:00
Travis Ralston	3e704822be	Comments help	2018-10-23 10:25:31 -06:00
Richard van der Hoff	b3f6dddad2	Give some more things logcontexts (#4077)	2018-10-23 14:29:17 +01:00
Richard van der Hoff	5c445114d3	Correctly account for cpu usage by background threads (#4074) ... Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064	2018-10-23 13:12:32 +01:00
Richard van der Hoff	1fe6bbb555	Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deploy ... Add information about the matrix-docker-ansible-deploy playbook	2018-10-23 10:11:58 +01:00
Richard van der Hoff	abd9914683	Changelog	2018-10-22 16:12:11 +01:00
Richard van der Hoff	026cd91ac8	Run PusherPool.start as a background process ... We don't do anything with the result, so this is needed to give this code a logcontext.	2018-10-22 16:12:11 +01:00
Richard van der Hoff	f749607c91	Make on_started synchronous too ... This brings it into line with on_new_notifications and on_new_receipts. It requires a little bit of hoop-jumping in EmailPusher to load the throttle params before the first loop.	2018-10-22 16:12:11 +01:00
Richard van der Hoff	e7a16c6210	Remove redundant run_as_background_process() from pusherpool ... `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough.	2018-10-22 16:12:11 +01:00
Richard van der Hoff	c7273c11bc	Give pushers their own background logcontext ... Each pusher has its own loop which runs for as long as it has work to do. This should run in its own background thread with its own logcontext, as other similar loops elsewhere in the system do - which means that CPU usage is consistently attributed to that loop, rather than to whatever request happened to start the loop.	2018-10-22 16:12:11 +01:00
Richard van der Hoff	5110f4e425	move get_all_pushers call down ... simplifies the interface to _start_pushers	2018-10-22 16:12:11 +01:00
Richard van der Hoff	04277d0ed8	Factor PusherPool._start_pusher out of _start_pushers ... ... and use it from start_pusher_by_id. This mostly simplifies start_pusher_by_id.	2018-10-22 16:12:11 +01:00
Richard van der Hoff	3e8b02c939	Rename _refresh_pusher ... This is public (or at least, called from outside the class), so ought to have a better name.	2018-10-22 16:12:11 +01:00
Richard van der Hoff	7aea00069c	Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts ... Run MAU queries as background processes	2018-10-22 14:46:59 +01:00
Richard van der Hoff	911db96658	Merge pull request #4073 from matrix-org/rav/require_psutil ... Make psutil an explicit dependency	2018-10-22 12:33:21 +01:00
Matthew Hodgson	058934b1cf	uh, Matrix is called Matrix these days...	2018-10-21 12:18:30 +01:00
Richard van der Hoff	a6f421e812	Run MAU queries as background processes ... Fixes #3820	2018-10-20 02:14:35 +01:00
Amber Brown	e1728dfcbe	Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on py3) (#4068)	2018-10-20 11:16:55 +11:00
Richard van der Hoff	e5b52d0f94	Make psutil an explicit dependency ... As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062.	2018-10-19 21:51:15 +01:00
Richard van der Hoff	81d4f51524	Merge branch 'rav/fix_email_templates_4065' into develop	2018-10-19 21:37:32 +01:00
Richard van der Hoff	593389a077	Remove notes on fallback for email_templates ... This fallback didn't work, and was removed in #4069.	2018-10-19 21:35:57 +01:00
Richard van der Hoff	f62c597d14	Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 ... Calculate absolute path for email templates	2018-10-19 16:33:54 +01:00
Richard van der Hoff	cc325c7069	Calculate absolute path for email templates	2018-10-19 14:01:59 +01:00
Amber Brown	e404ba9aac	Fix manhole on py3 (pt 2) (#4067)	2018-10-19 22:26:00 +11:00
Amber Brown	b69216f768	Make the metrics less racy (#4061)	2018-10-19 21:45:45 +11:00
Richard van der Hoff	6a4d01ee94	Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3 ... Make manhole work on Python 3 again	2018-10-19 10:23:44 +01:00
Erik Johnston	0d31109ed5	Newsfile	2018-10-19 10:14:29 +01:00
Erik Johnston	74e7617083	Clean up room alias creation	2018-10-19 10:11:56 +01:00
Amber Brown	1d17fc52ae	changelog	2018-10-19 09:27:10 +11:00
Amber Brown	a36b0ec195	make a bytestring	2018-10-19 09:24:00 +11:00
Amber Brown	6190abe8da	Merge pull request #4057 from matrix-org/rav/use_correct_python ... Use the right python when starting workers	2018-10-19 09:09:08 +11:00
Richard van der Hoff	c69026a758	Use the right python when starting workers ... We should use the same python to start the workers as we do for the main synapse (ie, the same one used to run synctl.)	2018-10-18 21:06:30 +01:00
Richard van der Hoff	2baebace6a	Merge branch 'master' into develop	2018-10-18 17:29:57 +01:00
Richard van der Hoff	c00f4d237b	Add warnings about the upgrade to 0.33.7	2018-10-18 17:17:39 +01:00
Richard van der Hoff	03287c350e	remove redundant changelog file ... this change has been released	2018-10-18 15:09:34 +01:00
Richard van der Hoff	c632bc8654	Merge branch 'master' into develop	2018-10-18 15:07:03 +01:00
Richard van der Hoff	926da4dda8	0.33.7	2018-10-18 14:57:32 +01:00
Erik Johnston	e77f24d80a	Merge pull request #4049 from matrix-org/erikj/synctl_colour ... Only colourise synctl output when attached to tty	2018-10-18 10:51:14 +01:00
Richard van der Hoff	8c2b8d7f0b	fix changelog formatting	2018-10-17 17:42:12 +01:00
Richard van der Hoff	c7d0f34a3c	v0.33.7rc2	2018-10-17 17:40:19 +01:00
Richard van der Hoff	52e3d3813b	prep changelog	2018-10-17 17:40:01 +01:00
Richard van der Hoff	0fd2321629	Fix incorrect truncation in get_missing_events ... It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id.	2018-10-17 17:35:26 +01:00
Richard van der Hoff	f1bfe6167a	Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data ... Ship the email templates as package_data	2018-10-17 17:34:22 +01:00
Erik Johnston	4e726783ea	Merge pull request #4050 from matrix-org/erikj/fix_py37_iteration ... Fix bug where we raised StopIteration in a generator	2018-10-17 17:07:19 +01:00
Erik Johnston	a5aea15a6b	Assume isatty is always defined, and catch AttributeError. Also don't bother checking colour==Normal	2018-10-17 17:06:49 +01:00