10815 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	bf98fa0864	Part user from rooms on account deactivate ... 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.	2018-05-08 15:58:35 +01:00
Richard van der Hoff	678e649b78	Merge pull request #3190 from mujx/notif-token-fix ... notifications: Convert next_token to string according to the spec	2018-05-08 13:54:47 +01:00
Erik Johnston	0b7dfbb194	Merge pull request #3186 from matrix-org/erikj/fix_int_values_metrics ... Fix metrics that have integer value labels	2018-05-08 09:48:50 +01:00
Konstantinos Sideris	88868b2839	notifications: Convert next_token to string according to the spec ... Currently the parameter is serialized as an integer. Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>	2018-05-05 12:55:02 +03:00
kaiyou	5addeaa02c	Add Docker packaging in the author list	2018-05-04 21:23:01 +02:00
Erik Johnston	6d8ec3462d	Note that label values can be anything	2018-05-03 16:25:05 +01:00
Erik Johnston	95b6912045	Fix metrics that have integer value labels	2018-05-03 15:51:04 +01:00
Richard van der Hoff	966686c845	Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_fail ... Make 'unexpected logging context' into warnings	2018-05-03 15:10:04 +01:00
Richard van der Hoff	093d8c415a	Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail	2018-05-03 14:59:29 +01:00
Richard van der Hoff	0ba609dc6f	Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks ... Fix logcontext leaks in rate limiter	2018-05-03 14:58:13 +01:00
Richard van der Hoff	2117f84323	Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown ... Fix 'Unhandled Error' logs with Twisted 18.4	2018-05-03 12:40:11 +01:00
Richard van der Hoff	a7fe62f0cb	Fix logcontext leaks in rate limiter	2018-05-03 12:31:59 +01:00
Will Hunt	2e7a94c36b	Don't abortConnection() if the transport connection has already closed.	2018-05-03 12:31:47 +01:00
Richard van der Hoff	a2aaa9cb3c	Merge pull request #3178 from matrix-org/rav/fix_request_timeouts ... fix http request timeout code	2018-05-03 11:33:26 +01:00
Richard van der Hoff	d72faf2fad	Fix changes warning	2018-05-03 10:56:42 +01:00
Richard van der Hoff	a0501ac57e	Warn of potential client incompatibility from #3161	2018-05-03 10:51:39 +01:00
Erik Johnston	0a3b51c420	Merge pull request #3141 from matrix-org/erikj/fixup_state ... Refactor event storage to prepare for changes in state calculations	2018-05-03 10:39:20 +01:00
Erik Johnston	31c7c29d43	Fix up grammar	2018-05-03 10:38:58 +01:00
Richard van der Hoff	902673e356	Merge pull request #3161 from NotAFile/remove-v1auth ... Make Client-Server API return 403 for invalid token	2018-05-03 10:10:57 +01:00
Erik Johnston	53a5fdf312	Merge pull request #3175 from matrix-org/erikj/escape_metric_values ... Escape label values in prometheus metrics	2018-05-03 10:01:04 +01:00
Richard van der Hoff	1dfd650348	add missing param to cancelled_to_request_timed_out_error ... This gets two arguments, not one.	2018-05-02 22:42:36 +01:00
kaiyou	9a779c2ddb	Merge remote-tracking branch 'upstream/master' into feat-dockerfile	2018-05-02 20:22:41 +02:00
Erik Johnston	a41117c63b	Make _escape_character take MatchObject	2018-05-02 17:27:27 +01:00
Erik Johnston	32015e1109	Escape label values in prometheus metrics	2018-05-02 16:52:42 +01:00
Richard van der Hoff	3a42aed9a1	Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks ... Fix a class of logcontext leaks	2018-05-02 16:45:51 +01:00
Richard van der Hoff	5a0be97ab2	Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks ... Fix logcontext leak in media repo	2018-05-02 16:43:04 +01:00
Richard van der Hoff	415c6b672e	Merge branch 'develop' into rav/more_logcontext_leaks	2018-05-02 16:16:01 +01:00
Richard van der Hoff	4e9bdeba57	Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks ... Fix a couple of logcontext leaks in unit tests	2018-05-02 16:15:22 +01:00
Richard van der Hoff	be31adb036	Fix logcontext leak in media repo ... Make FileResponder.write_to_consumer uphold the logcontext contract	2018-05-02 16:14:50 +01:00
Richard van der Hoff	11607006d9	Remove spurious unittest.DEBUG	2018-05-02 15:48:47 +01:00
Richard van der Hoff	46beeb9a30	Fix a couple of logcontext leaks in unit tests ... ... which were making other, innocent, tests, fail. Plus remove a spurious unittest.DEBUG which was making the output noisy.	2018-05-02 15:46:22 +01:00
Richard van der Hoff	f22e7cda2c	Fix a class of logcontext leaks ... 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`.	2018-05-02 11:58:00 +01:00
Richard van der Hoff	a8d8bf92e0	Merge pull request #3168 from matrix-org/rav/fix_logformatter ... Fix incorrect reference to StringIO	2018-05-02 10:03:36 +01:00
Richard van der Hoff	e482f8cd85	Fix incorrect reference to StringIO ... This was introduced in 4f2f5171	2018-05-02 09:12:26 +01:00
kaiyou	4f2e898c29	Make the logging level configurable	2018-05-01 20:50:03 +02:00
kaiyou	d4c14e1438	Fix the documentation about 'POSTGRES_DB'	2018-05-01 20:47:58 +02:00
Matthew Hodgson	9f21de6a01	missing word :|	2018-05-01 19:19:46 +01:00
Matthew Hodgson	da602419b2	missing word :|	2018-05-01 19:19:23 +01:00
Matthew Hodgson	8ae7096958	Merge branch 'release-v0.28.1' into develop	2018-05-01 19:05:03 +01:00
Matthew Hodgson	562532dd2d	Merge branch 'release-v0.28.1'	2018-05-01 19:04:11 +01:00
Matthew Hodgson	5c2214f4c7	fix markdown	2018-05-01 19:03:35 +01:00
Neil Johnson	2414178ed6	Merge branch 'master' into develop	2018-05-01 18:53:56 +01:00
Neil Johnson	40d1bbd257	fix conflict in changelog from previous release	2018-05-01 18:52:44 +01:00
Matthew Hodgson	8e6bd0e324	changelog for 0.28.1	2018-05-01 18:28:23 +01:00
Neil Johnson	8570bb84cc	Update __init__.py ... bump version	2018-05-01 18:22:53 +01:00
Richard van der Hoff	ca7211104e	Merge branch 'release-v0.28.1' into develop	2018-05-01 18:16:57 +01:00
Richard van der Hoff	d5eee5d601	Merge commit '33f469b' into release-v0.28.1	2018-05-01 18:14:18 +01:00
Richard van der Hoff	d858f3bd4e	Miscellaneous fixes to python_dependencies ... * add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)	2018-05-01 18:13:54 +01:00
Richard van der Hoff	33f469ba19	Apply some limits to depth to counter abuse ... * 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	2018-05-01 17:54:19 +01:00
Neil Johnson	dd1a832419	remove user agent from data model, will just join on user_ips	2018-05-01 12:13:49 +01:00