9905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	9a89dae8c5	Fix typo in thumbnail resource causing access times to be incorrect	2018-01-18 15:06:24 +00:00
Richard van der Hoff	5a4da21d58	Merge pull request #2810 from matrix-org/rav/metrics_fixes ... Fix bugs in block metrics	2018-01-18 13:35:28 +00:00
Richard van der Hoff	d57765fc8a	Fix bugs in block metrics ... ... which I introduced in #2785	2018-01-18 12:24:42 +00:00
Richard van der Hoff	d6af5512bb	Merge pull request #2809 from matrix-org/rav/metrics_errors ... better exception logging in callbackmetrics	2018-01-18 11:46:37 +00:00
Richard van der Hoff	ce236f8ac8	better exception logging in callbackmetrics ... when we fail to render a metric, give a clue as to which metric it was	2018-01-18 11:30:49 +00:00
Richard van der Hoff	36da256cc6	Merge pull request #2805 from matrix-org/rav/log_state_res ... Log room when doing state resolution	2018-01-17 18:05:04 +00:00
Richard van der Hoff	1224612a79	Log room when doing state resolution ... Mostly because it helps figure out what is prompting the resolution	2018-01-17 17:11:59 +00:00
Erik Johnston	a87006f9c7	Merge pull request #2783 from matrix-org/erikj/media_last_accessed ... Keep track of last access time for local media	2018-01-17 16:39:02 +00:00
Matthew Hodgson	06db5c4b76	Merge pull request #2803 from matrix-org/matthew/fix-userdir-sql ... fix SQL when searching all users	2018-01-17 16:27:54 +00:00
Richard van der Hoff	8716eb4920	Merge pull request #2802 from matrix-org/rav/clean_up_resolve_events ... Split resolve_events into two functions	2018-01-17 16:01:33 +00:00
Matthew Hodgson	2d9ab533f9	fix SQL when searching all users	2018-01-17 15:58:52 +00:00
Richard van der Hoff	390093d45e	Split resolve_events into two functions ... ... so that the return type doesn't depend on the arg types	2018-01-17 15:44:31 +00:00
Erik Johnston	2fb3a28c98	Remove lost comment	2018-01-17 14:59:44 +00:00
Richard van der Hoff	a7e4ff9cca	Merge pull request #2795 from matrix-org/rav/track_db_scheduling ... Track DB scheduling delay per-request	2018-01-17 14:29:37 +00:00
Richard van der Hoff	f884cfffb9	Merge pull request #2797 from matrix-org/rav/user_id_checking ... Sanity checking for user ids	2018-01-17 14:29:12 +00:00
Richard van der Hoff	a5213df1f7	Sanity checking for user ids ... Check the user_id passed to a couple of APIs for validity, to avoid "IndexError: list index out of range" exception which looks scary and results in a 500 rather than a more useful error. Fixes #1432, among other things	2018-01-17 14:28:54 +00:00
Richard van der Hoff	e8f7541d3f	Merge remote-tracking branch 'origin/develop' into rav/track_db_scheduling	2018-01-17 14:01:57 +00:00
Richard van der Hoff	fb6563b4be	Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millis ... Track db txn time in millisecs	2018-01-17 13:52:42 +00:00
Richard van der Hoff	1954e867b4	Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errors ... Fix 'NoneType' object has no attribute 'writeHeaders'	2018-01-17 13:52:24 +00:00
Richard van der Hoff	f23b4078c0	Merge pull request #2794 from matrix-org/rav/rework_run_interaction ... rework runInteraction in terms of runConnection	2018-01-17 13:50:42 +00:00
Richard van der Hoff	11ab2f56f5	Merge branch 'develop' into rav/fix_closed_connection_errors	2018-01-17 11:25:11 +00:00
Richard van der Hoff	0486a7814a	Merge branch 'develop' into rav/rework_run_interaction	2018-01-17 11:24:38 +00:00
Richard van der Hoff	90c14da992	Merge branch 'develop' into rav/db_txn_time_in_millis	2018-01-17 11:19:55 +00:00
Richard van der Hoff	1067b96364	Merge pull request #2792 from matrix-org/rav/optimise_logging_context ... Optimise LoggingContext creation and copying	2018-01-17 11:19:28 +00:00
Richard van der Hoff	38506773eb	Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_context	2018-01-17 10:57:13 +00:00
Erik Johnston	300edc2348	Update last access time when thumbnails are viewed	2018-01-17 10:24:43 +00:00
Erik Johnston	05f98a2224	Keep track of last access time for local media	2018-01-17 10:24:43 +00:00
Erik Johnston	3cb2dabaad	Merge pull request #2789 from matrix-org/erikj/fix_thumbnails ... Fix thumbnailing remote files	2018-01-17 10:22:20 +00:00
Erik Johnston	d728c47142	Add docstring	2018-01-17 10:06:14 +00:00
Richard van der Hoff	936482d507	Fix 'NoneType' object has no attribute 'writeHeaders' ... Avoid throwing a (harmless) exception when we try to write an error response to an http request where the client has disconnected. This comes up as a CRITICAL error in the logs which tends to mislead people into thinking there's an actual problem	2018-01-16 17:58:16 +00:00
Richard van der Hoff	3d12d97415	Track DB scheduling delay per-request ... For each request, track the amount of time spent waiting for a db connection. This entails adding it to the LoggingContext and we may as well add metrics for it while we are passing.	2018-01-16 17:23:32 +00:00
Richard van der Hoff	0f5d2cc37c	Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_scheduling	2018-01-16 17:09:15 +00:00
Richard van der Hoff	8615f19d20	rework runInteraction in terms of runConnection ... ... so that we can share the code	2018-01-16 17:08:29 +00:00
Matthew Hodgson	5e97ca7ee6	fix typo	2018-01-16 16:52:35 +00:00
Erik Johnston	d863f68cab	Use local vars	2018-01-16 16:24:15 +00:00
Erik Johnston	6368e5c0ab	Change _generate_thumbnails to take media_type	2018-01-16 16:17:38 +00:00
Erik Johnston	0a90d9ede4	Move setting of file_id up to caller	2018-01-16 16:03:05 +00:00
Richard van der Hoff	6324b65f08	Track db txn time in millisecs ... ... to reduce the amount of floating-point foo we do.	2018-01-16 15:53:18 +00:00
Richard van der Hoff	44a498418c	Optimise LoggingContext creation and copying ... It turns out that the only thing we use the __dict__ of LoggingContext for is `request`, and given we create lots of LoggingContexts and then copy them every time we do a db transaction or log line, using the __dict__ seems a bit redundant. Let's try to optimise things by making the request attribute explicit.	2018-01-16 15:49:42 +00:00
Erik Johnston	5dfc83704b	Fix typo	2018-01-16 14:32:56 +00:00
Richard van der Hoff	febdca4b37	Merge pull request #2785 from matrix-org/rav/reorganise_metrics_again ... Reorganise request and block metrics	2018-01-16 14:10:21 +00:00
Richard van der Hoff	f5f89fda21	Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leak ... Fix a logcontext leak in persist_events	2018-01-16 14:09:13 +00:00
Erik Johnston	307f88dfb6	Fix up log lines	2018-01-16 13:53:52 +00:00
Richard van der Hoff	807e848f0f	Merge pull request #2787 from matrix-org/rav/worker_event_counts ... Metrics for events processed in appservice and fed sender	2018-01-16 13:14:09 +00:00
Richard van der Hoff	4a31a61ef9	Merge pull request #2786 from matrix-org/rav/rdata_metrics ... Metrics for number of RDATA commands received	2018-01-16 13:13:53 +00:00
Richard van der Hoff	ee7a1cabd8	document metrics changes	2018-01-16 13:04:01 +00:00
Erik Johnston	9795b9ebb1	Correctly use server_name/file_id when generating/fetching remote thumbnails	2018-01-16 12:02:06 +00:00
Erik Johnston	c5b589f2e8	Log when we respond with 404	2018-01-16 12:01:40 +00:00
Richard van der Hoff	64ddec1bc0	Fix a logcontext leak in persist_events ... ObserveableDeferred expects its callbacks to be called without any logcontexts, whereas it turns out we were calling them with the logcontext of the request which initiated the persistence loop. It seems wrong that we are attributing work done in the persistence loop to the request that happened to initiate it, so let's solve this by dropping the logcontext for it. (I'm not sure this actually causes any real problems other than messages in the debug log, but let's clean it up anyway)	2018-01-16 11:47:36 +00:00
Erik Johnston	a4c5e4a645	Fix thumbnailing remote files	2018-01-16 11:37:50 +00:00