14426 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	c783294549	changelog	2019-06-24 14:14:52 +01:00
Richard van der Hoff	16b52642e2	Don't load the generated config as the default. ... It's too confusing.	2019-06-24 14:14:52 +01:00
Richard van der Hoff	7c2f8881a9	Ensure that all config options have sensible defaults ... This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.	2019-06-24 14:14:52 +01:00
Richard van der Hoff	cf7aef1114	Merge pull request #5516 from matrix-org/rav/acme_key_path ... Allow configuration of the path used for ACME account keys.	2019-06-24 14:14:20 +01:00
Richard van der Hoff	5d9c101551	changelog	2019-06-24 13:51:22 +01:00
Richard van der Hoff	367a8263b3	Remove unused Config.config_dir_path attribute ... This is no longer used and only serves to confuse.	2019-06-24 13:51:22 +01:00
Richard van der Hoff	edea4bb5be	Allow configuration of the path used for ACME account keys. ... Because sticking it in the same place as the config isn't necessarily the right thing to do.	2019-06-24 13:51:22 +01:00
Richard van der Hoff	c3c6b00d95	Pass config_dir_path and data_dir_path into Config.read_config. (#5522) ... * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config	2019-06-24 11:34:45 +01:00
Richard van der Hoff	21bf4318b5	Factor acme bits out to a separate file (#5521) ... This makes some of the conditional-import hoop-jumping easier.	2019-06-24 11:33:56 +01:00
Richard van der Hoff	c753c098dd	Merge pull request #5498 from matrix-org/rav/fix_clock_reversal ... Use monotonic clock where possible for metrics	2019-06-24 09:55:12 +01:00
Richard van der Hoff	6cda36777b	Drop support for cpu_affinity (#5525) ... This has no useful purpose on python3, and is generally a source of confusion.	2019-06-22 11:01:55 +10:00
Richard van der Hoff	e1a795758c	Improve help and cmdline option names for --generate-config options (#5512) ... * group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.	2019-06-21 18:50:43 +01:00
Richard van der Hoff	03cea2b0fe	Refactor Config parser and add some comments. (#5511) ... Add some comments, and simplify `read_config_files`.	2019-06-21 17:43:38 +01:00
Richard van der Hoff	37933a3bf8	Improve logging when generating config files (#5510) ... Make it a bit clearer what's going on.	2019-06-21 17:14:56 +01:00
Andrew Morgan	5d6644efe0	Only import jinja2 when needed (#5514) ... Fixes https://github.com/matrix-org/synapse/issues/5431 `jinja2` was being imported even when it wasn't strictly necessary. This made it required to run Synapse, even if the functionality that required it wasn't enabled. This was causing new Synapse installations to crash on startup. Email modules are now required.	2019-06-21 16:52:09 +01:00
Richard van der Hoff	0e8b35f7b0	Fix "Unexpected entry in 'full_schemas'" log warning (#5509) ... There is a README.txt which always sets off this warning, which is a bit alarming when you first start synapse. I don't think we need to warn about this.	2019-06-21 15:11:57 +01:00
Richard van der Hoff	2f8491daef	Fix logging error when a tampered event is detected. (#5500)	2019-06-21 15:11:42 +01:00
Erik Johnston	8fecb5fcbf	Merge pull request #5513 from matrix-org/erikj/fix_messages_token ... Fix /messages on worker when no token supplied	2019-06-21 14:36:03 +01:00
Erik Johnston	2b0bde935a	Newsfile	2019-06-21 14:16:03 +01:00
Erik Johnston	7eadb74056	Fix /messages on worker when no token supplied	2019-06-21 14:15:59 +01:00
Erik Johnston	5f8a612af1	Merge pull request #5505 from matrix-org/erikj/messages_worker ... Support pagination API in client_reader worker	2019-06-21 13:20:46 +01:00
Erik Johnston	60b912cf0d	Update docs/workers.rst ... E_TOO_MANY_NEGATIVES Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-06-21 11:54:03 +01:00
Erik Johnston	626a26dbb8	Newsfile	2019-06-21 10:46:11 +01:00
Erik Johnston	f3ab533374	Support pagination API in client_reader worker	2019-06-21 10:43:12 +01:00
Erik Johnston	7456698241	Merge pull request #5476 from matrix-org/erikj/histogram_extremities ... Add metrics for length of new extremities persisted.	2019-06-21 09:58:54 +01:00
Neil Johnson	f47969f42a	Improve email notification logging (#5502)	2019-06-20 15:14:26 +01:00
Erik Johnston	f8bd30af2a	Black	2019-06-20 13:10:06 +01:00
Erik Johnston	45f28a9d2f	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_extremities	2019-06-20 11:59:14 +01:00
Amber Brown	32e7c9e7f2	Run Black. (#5482)	2019-06-20 19:32:02 +10:00
Richard van der Hoff	15bf32e062	Use monotonic clock where possible for metrics ... Fixes intermittent errors observed on Apple hardware which were caused by time.clock() appearing to go backwards when called from different threads. Also fixes a bug where database activity times were logged as 1/1000 of their correct ratio due to confusion between milliseconds and seconds.	2019-06-19 21:09:43 +01:00
Erik Johnston	7dcf984075	Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error ... Handle the case of `get_missing_events` failing	2019-06-19 13:20:09 +01:00
Erik Johnston	e0be8d7016	Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events ... Add experimental option to reduce extremities.	2019-06-19 13:19:18 +01:00
Erik Johnston	65787b0f7c	Add descriptions and remove redundant set(..)	2019-06-19 11:49:39 +01:00
Richard van der Hoff	ceb2fa60a5	Merge pull request #5490 from matrix-org/rav/xmlsec_in_docker ... Include xmlsec in the docker image	2019-06-19 11:33:06 +01:00
Erik Johnston	554609288b	Run as background process and fix comments	2019-06-19 11:33:03 +01:00
Brendan Abolivier	10f9e35b43	Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typo ... Fix typo in deactivation background job	2019-06-19 11:32:38 +01:00
Brendan Abolivier	092e36457a	Fix typo in deactivation background job	2019-06-19 11:09:41 +01:00
Richard van der Hoff	8fcd2ca907	Merge pull request #4276 from Ralith/performance-advice ... Improve advice regarding poor performance	2019-06-18 23:29:58 +01:00
David Baker	f2d2ae03da	Add some logging to 3pid invite sig verification (#5015) ... I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here.	2019-06-18 22:51:24 +01:00
Richard van der Hoff	b093cfb02c	changelog	2019-06-18 22:36:40 +01:00
Richard van der Hoff	8e7ef3a023	Include xmlsec in the docker image ... Fixes #5467.	2019-06-18 22:35:19 +01:00
Richard van der Hoff	b36de88066	README.rst: fix header level	2019-06-18 18:32:51 +01:00
Erik Johnston	2b20d0fb59	Fix logline	2019-06-18 16:12:53 +01:00
Erik Johnston	19b80fe68a	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_missing_events_error	2019-06-18 16:11:43 +01:00
Erik Johnston	fc51e21326	Newsfile	2019-06-18 15:03:12 +01:00
Erik Johnston	b42f90470f	Add experimental option to reduce extremities. ... Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.	2019-06-18 15:02:18 +01:00
Erik Johnston	16a3124b76	Only count non-cache state resolution	2019-06-18 13:02:06 +01:00
Erik Johnston	c9385dd238	Use consistent buckets	2019-06-18 12:43:41 +01:00
cclauss	82d9d524bd	Fix seven contrib files with Python syntax errors (#5446) ... * Fix seven contrib files with Python syntax errors Signed-off-by: cclauss <cclauss@me.com>	2019-06-18 03:21:30 +10:00
Brendan Abolivier	d6328e03fd	Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid ... Add third party rules hook for 3PID invites	2019-06-17 18:08:31 +01:00