6934 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Haines	5cc7564c5c	Optionally start or stop workers in synctl. ... Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades.	2016-06-21 16:38:05 +01:00
Mark Haines	0fe0b0eeb6	Merge pull request #888 from matrix-org/markjh/content_repo ... Remove the legacy v0 content upload API.	2016-06-21 14:01:01 +01:00
David Baker	0126a5d60a	Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail ... Fix substitution failure in mail template	2016-06-21 13:48:54 +01:00
Mark Haines	13e334506c	Remove the legacy v0 content upload API. ... The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.	2016-06-21 11:47:39 +01:00
David Baker	6b40e4f52a	Fix substitution failure in mail template	2016-06-21 11:37:56 +01:00
Mark Haines	d5fb561709	Optionally make committing to postgres asynchronous. ... Useful when running tests when you don't care whether the server will lose data that it claims that it has committed.	2016-06-20 17:53:38 +01:00
Erik Johnston	d8ec81cc31	Merge pull request #879 from matrix-org/erikj/linearize_fed_server ... Linearize some federation endpoints based on (origin, room_id)	2016-06-20 17:34:29 +01:00
Erik Johnston	bc72d381b2	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse	2016-06-20 14:18:04 +01:00
Erik Johnston	4d362a61ea	Bump version and changelog	2016-06-20 14:17:42 +01:00
Erik Johnston	00c281f6a4	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1	2016-06-20 14:13:54 +01:00
Mark Haines	c8cd41cdd8	Merge pull request #880 from matrix-org/markjh/registered_user ... Remove registered_users from the distributor.	2016-06-17 19:45:06 +01:00
Mark Haines	41e4b2efea	Add the create_profile method back since the tests use it	2016-06-17 19:20:47 +01:00
Mark Haines	0c13d45522	Add a comment on why we don't create a profile for upgrading users	2016-06-17 19:18:53 +01:00
Mark Haines	9f1800fba8	Remove registered_users from the distributor. ... The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.	2016-06-17 19:14:16 +01:00
Erik Johnston	8f4a9bbc16	Linearize some federation endpoints based on (origin, room_id)	2016-06-17 16:43:45 +01:00
Erik Johnston	9ba2bf1570	Merge pull request #878 from matrix-org/erikj/ujson ... Disable responding with canonical json for federation	2016-06-17 16:22:12 +01:00
Erik Johnston	120c238705	Disable responding with canonical json for federation	2016-06-17 16:10:37 +01:00
Erik Johnston	1c1f633b13	Merge pull request #877 from matrix-org/erikj/frozen_default ... Turn use_frozen_events off by default	2016-06-17 15:33:55 +01:00
Erik Johnston	6660f37558	Merge pull request #876 from matrix-org/erikj/sign_own ... Only re-sign our own events	2016-06-17 15:23:20 +01:00
Mark Haines	20e5b46b20	Merge pull request #875 from matrix-org/markjh/email_formatting ... Fix ``KeyError: 'msgtype'``. Use ``.get``	2016-06-17 15:14:58 +01:00
Erik Johnston	0113ad36ee	Enable use_frozen_events in tests	2016-06-17 15:13:13 +01:00
Erik Johnston	3e41de05cc	Turn use_frozen_events off by default	2016-06-17 15:11:22 +01:00
Erik Johnston	2884712ca7	Only re-sign our own events	2016-06-17 14:47:33 +01:00
Mark Haines	ded01c3bf6	Fix `KeyError: 'msgtype'. Use .get` ... Fixes a key error where the mailer tried to get the ``msgtype`` of an event that was missing a ``msgtype``. ``` File "synapse/push/mailer.py", line 264, in get_notif_vars File "synapse/push/mailer.py", line 285, in get_message_vars File ".../frozendict/__init__.py", line 10, in __getitem__ return self.__dict[key] KeyError: 'msgtype' ```	2016-06-17 13:49:16 +01:00
Mark Haines	8c75040c25	Fix setting gc thresholds in the workers	2016-06-17 11:48:12 +01:00
Mark Haines	f1073ad43d	Merge pull request #874 from matrix-org/markjh/worker_config ... Inline the synchrotron and pusher configs into the main config	2016-06-17 10:58:52 +01:00
Mark Haines	a352b68acf	Use worker_ prefixes for worker config, use existing support for multiple config files	2016-06-16 17:29:50 +01:00
Mark Haines	364d616792	Access the event_cache_size directly from the server object. ... This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.	2016-06-16 12:53:15 +01:00
Mark Haines	bde13833cb	Access replication_url from the worker config directly	2016-06-16 12:44:40 +01:00
Mark Haines	80a1bc7db5	Comment on what's going on in clobber_with_worker_config	2016-06-16 11:29:45 +01:00
Mark Haines	f1f70bf4b5	Merge remote-tracking branch 'origin/develop' into markjh/worker_config	2016-06-16 11:20:17 +01:00
Mark Haines	dbb5a39b64	Add worker config module	2016-06-16 11:09:15 +01:00
Mark Haines	885ee861f7	Inline the synchrotron and pusher configs into the main config	2016-06-16 11:06:12 +01:00
Erik Johnston	486b9a6a2d	Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode ... Fix TypeError in call to bcrypt.hashpw	2016-06-16 10:12:17 +01:00
Erik Johnston	1f31381611	Merge pull request #872 from matrix-org/erikj/preview_url_fixes ... Fix some `/preview_url` explosions	2016-06-16 10:08:29 +01:00
Salvatore LaMendola	ed5f43a55a	Fix TypeError in call to bcrypt.hashpw ... - At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>	2016-06-16 00:43:42 -04:00
Erik Johnston	09a17f965c	Line lengths	2016-06-15 16:58:12 +01:00
Erik Johnston	1e9026e484	Handle floats as img widths	2016-06-15 16:58:05 +01:00
Erik Johnston	a60169ea09	Handle og props with not content	2016-06-15 16:57:48 +01:00
Mark Haines	78a16d395c	Merge pull request #867 from matrix-org/markjh/enable_jenkins_synchrotron ... Enable testing the synchrotron on jenkins	2016-06-15 16:41:58 +01:00
Erik Johnston	5436848955	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse into develop	2016-06-15 16:24:07 +01:00
Erik Johnston	0477368e9a	Update change log	2016-06-15 16:06:26 +01:00
Erik Johnston	0ef0655b83	Bump version and changelog	2016-06-15 15:50:48 +01:00
Erik Johnston	a64dbae90b	Merge pull request #871 from matrix-org/erikj/linearize_state_fetch_on_pdu ... Linearize fetching of gaps on incoming events	2016-06-15 15:31:57 +01:00
Erik Johnston	d41a1a91d3	Linearize fetching of gaps on incoming events ... This potentially stops the server from doing multiple requests for the same data.	2016-06-15 15:16:14 +01:00
Richard van der Hoff	15bf3e3376	Merge pull request #870 from matrix-org/rav/work_around_tls_bug ... Work around TLS bug in twisted	2016-06-15 13:28:13 +01:00
Erik Johnston	d9f7fa2e57	Merge pull request #869 from matrix-org/erikj/backfill_fix ... Correctly mark backfilled events as backfilled	2016-06-15 11:21:31 +01:00
Erik Johnston	b31c49d676	Correctly mark backfilled events as backfilled	2016-06-15 10:59:08 +01:00
Richard van der Hoff	255c229f23	Work around TLS bug in twisted ... Wrap up twisted's FileBodyProducer to work around https://twistedmatrix.com/trac/ticket/8473. Hopefully this fixes https://matrix.org/jira/browse/SYN-700.	2016-06-15 10:39:08 +01:00
Erik Johnston	d12134ce37	Merge pull request #868 from matrix-org/erikj/invalid_id ... Make get_domain_from_id throw SynapseError on invalid ID	2016-06-14 15:09:07 +01:00