3717 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	2366d28780	Don't needlessly join on state_events	2015-04-30 14:02:06 +01:00
David Baker	d89a9f7283	Add an access_log ... SYN-161 #resolve	2015-04-30 13:58:13 +01:00
Mark Haines	1aa11cf7ce	Allow multiple config files, set up a default config before applying the config files	2015-04-30 13:48:15 +01:00
David Baker	0c1b7f843b	Unused import	2015-04-30 13:33:30 +01:00
David Baker	4b46fbec5b	Doesn't look like this is used anymore	2015-04-30 12:04:08 +01:00
Erik Johnston	1d7702833d	Make simple query rather than long one and then throw away half the results	2015-04-30 10:16:12 +01:00
Mark Haines	6b69ddd17a	remove duplicate parse_size method	2015-04-30 04:26:29 +01:00
Mark Haines	d624e2a638	Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class	2015-04-30 04:24:44 +01:00
Erik Johnston	b1ca784aca	Correctly decode, for sqlite and postgres, rows from pushers table	2015-04-29 19:41:14 +01:00
Erik Johnston	4a9dc5b2f5	pushkey' are also bytes.	2015-04-29 19:27:02 +01:00
Erik Johnston	0ade2712d1	Typo	2015-04-29 19:17:25 +01:00
Erik Johnston	50f96f256f	Also remove yield from within lock in the other generator	2015-04-29 19:17:00 +01:00
Erik Johnston	d2d61a8288	Fix deadlock in id_generators. No idea why this was an actual deadlock.	2015-04-29 19:15:23 +01:00
Erik Johnston	3e71d13acf	Also log when we've started pushers	2015-04-29 18:37:42 +01:00
Erik Johnston	e7a6edb0ee	Revert previous	2015-04-29 18:37:30 +01:00
Erik Johnston	c27d6ad6b5	Only start pushers when synapse has fully started	2015-04-29 18:25:24 +01:00
Erik Johnston	46daf2d200	Start pushers on reactor thread	2015-04-29 18:22:20 +01:00
Erik Johnston	3864b3a8e6	Actually return rows	2015-04-29 18:07:36 +01:00
Erik Johnston	0618978238	Typo, args wrong way round	2015-04-29 18:04:35 +01:00
Erik Johnston	09177f4f2e	Decode buffers in same thread	2015-04-29 18:03:42 +01:00
Erik Johnston	472be88674	We store pusher data as bytes	2015-04-29 17:43:46 +01:00
Erik Johnston	a6e62cf6d0	Fix off by one in presence token handling	2015-04-29 17:37:11 +01:00
David Baker	12d381bd5d	Decode the data json in the storage layer (was moved but this part was missed)	2015-04-29 17:13:51 +01:00
David Baker	f8c30faf25	Oops, update the contraint too	2015-04-29 16:58:42 +01:00
David Baker	61cd5d9045	Be more postgressive	2015-04-29 16:57:14 +01:00
David Baker	fb95035a65	Be postgressive	2015-04-29 16:53:41 +01:00
David Baker	4669def000	Oops, forgot the schema delta file	2015-04-29 16:50:16 +01:00
Erik Johnston	0337eaf321	txn.execute doesn't return cursors	2015-04-29 16:43:39 +01:00
Erik Johnston	884fb88e28	txn.execute doesn't return cursors	2015-04-29 16:35:20 +01:00
Erik Johnston	d76c058eea	Fix invalid SQL to work in postgres land	2015-04-29 16:30:25 +01:00
David Baker	9927170787	Accept camelcase + underscores in binding too	2015-04-29 15:57:09 +01:00
David Baker	109c8aafd2	Fix includes	2015-04-29 15:45:44 +01:00
David Baker	b7788f80a3	Accept both camelcase and underscore threepid creds for transition	2015-04-29 15:41:29 +01:00
Erik Johnston	c8ed9bd278	pushers table requires an access_token	2015-04-29 15:33:27 +01:00
Mark Haines	f2d90d5c02	Fix whitespace	2015-04-29 14:53:23 +01:00
Mark Haines	845b0b2c97	Check requirements before doing anything else when running the homeserver	2015-04-29 14:52:42 +01:00
Mark Haines	c0036ced54	bump syutil to 0.0.6	2015-04-29 14:16:41 +01:00
Erik Johnston	970a9b9d2b	We can't use REPLACE when upgrading databases now we have postgres	2015-04-29 13:55:44 +01:00
Erik Johnston	64991b0c8b	Merge pull request #129 from matrix-org/key_distribution ... Key distribution v2	2015-04-29 13:34:38 +01:00
Mark Haines	e26a3d8d9e	bump database schema version	2015-04-29 13:32:32 +01:00
Mark Haines	1319905d7a	Use a defer.gatherResults to collect results from the perspective servers	2015-04-29 13:31:14 +01:00
Mark Haines	a9549fdce3	Use bytea rather than BLOB	2015-04-29 13:16:09 +01:00
Mark Haines	4ad8b45155	Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py	2015-04-29 13:15:14 +01:00
Mark Haines	19167fd21f	Merge pull request #135 from matrix-org/erikj/postgres_charset_check ... Check that postgres database has correct charset set	2015-04-29 13:04:22 +01:00
Matthew Hodgson	9c4ea42e79	minimal doc	2015-04-29 12:22:20 +01:00
Mark Haines	74874ffda7	Update the query format used by keyring to match current key v2 spec	2015-04-29 12:14:08 +01:00
Erik Johnston	cd0864121b	Make postgres database error slightly more helpful	2015-04-29 12:12:25 +01:00
Erik Johnston	4932a7e2d9	Use __all__ instead of assert to stop pyflakes from warning about unused import in __init__	2015-04-29 12:12:25 +01:00
Matthew Hodgson	0baf923153	Merge pull request #134 from intelfx/contrib-systemd ... contrib/systemd: add a sample systemd unit file and a logger configuration	2015-04-29 12:10:02 +01:00
Mark Haines	9894da6a29	Merge branch 'develop' into erikj/postgres_charset_check	2015-04-29 11:58:06 +01:00