2171 Commits (9d36eb4eab036d9793132892b56c7fad4e585984)

Author	SHA1	Message	Date
David Baker	1fae1b3166	This api now no longer returns an array	2015-05-01 13:26:41 +01:00
Erik Johnston	80b4119279	Don't wait for storage of access_token	2015-05-01 13:14:05 +01:00
Erik Johnston	4011cf1c42	Cache latest_event_ids_in_room	2015-05-01 13:06:26 +01:00
Erik Johnston	657298cebd	Don't lock user_ips table for upsert.	2015-05-01 10:46:48 +01:00
Erik Johnston	fabb7acd45	Fix bug where we reconnected to the database on every query.	2015-05-01 10:24:24 +01:00
Erik Johnston	23c639ff32	Split a storage function in two so that we don't have to do extra work.	2015-05-01 10:17:19 +01:00
Erik Johnston	8be5284e91	Remove pointless join	2015-04-30 18:49:26 +01:00
Erik Johnston	503e4d3d52	Fix broken SQL	2015-04-30 18:44:47 +01:00
Erik Johnston	00718ae7a9	Need more yield	2015-04-30 18:43:39 +01:00
Erik Johnston	0465560c1a	Add missing param	2015-04-30 18:42:44 +01:00
Erik Johnston	61d05daab1	More join conditions	2015-04-30 18:41:05 +01:00
Erik Johnston	6ead27ddda	Add more conditions on JOINs to make postgres go a little faster.	2015-04-30 18:32:03 +01:00
Mark Haines	50c87b8eed	Allow "manhole" to be ommited from the config	2015-04-30 18:11:47 +01:00
Mark Haines	345995fcde	Remove the ~, comment the lines instead	2015-04-30 18:10:19 +01:00
Mark Haines	62cebee8ee	Update key.py	2015-04-30 17:54:01 +01:00
Mark Haines	95cbfee8ae	Update metrics.py	2015-04-30 17:52:20 +01:00
Mark Haines	6ea9cf58be	missing import	2015-04-30 17:21:21 +01:00
Erik Johnston	f383d5a801	Fix up get_current_state and get_room_name_and_aliases queries to parse events in transaction	2015-04-30 17:12:52 +01:00
Mark Haines	c95480963e	read the pid_file from the config file in synctl	2015-04-30 17:12:15 +01:00
Mark Haines	2d4d2bbae4	Merge branch 'develop' into markjh/config_cleanup ... Conflicts: synapse/config/captcha.py	2015-04-30 16:54:55 +01:00
Mark Haines	2f1348f339	Write a default log_config when generating config	2015-04-30 16:52:57 +01:00
Erik Johnston	69d4063651	Add get_rooms_for_user cache	2015-04-30 16:47:51 +01:00
David Baker	5b02f33451	Undo changes to logger config, ie. remove the access_log_file option: decision is to support this through log_config rather tan adding an option.	2015-04-30 16:21:39 +01:00
David Baker	054aa0d58c	Do access log using python's logging stuff, just under a separate logger name	2015-04-30 16:21:38 +01:00
Erik Johnston	3c4c229788	Don't use sub queries, it makes postgres sad	2015-04-30 16:16:53 +01:00
Mark Haines	74aaacf82a	Don't break when sizes or durations are given as integers	2015-04-30 16:04:02 +01:00
Mark Haines	29400b45b9	SYN-367: Use upsert rather than insert_or_replace	2015-04-30 15:21:31 +01:00
Mark Haines	c28f1d16f0	Add a random string to the auto generated key id	2015-04-30 15:13:14 +01:00
Mark Haines	265f30bd3f	Allow --enable-registration to be passed on the commandline	2015-04-30 15:04:06 +01:00
Mark Haines	c9e62927f2	Use disable_registration keys if they are present	2015-04-30 14:34:09 +01:00
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	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
Mark Haines	9894da6a29	Merge branch 'develop' into erikj/postgres_charset_check	2015-04-29 11:58:06 +01:00
Mark Haines	46d200a3a1	Implement minimum_valid_until_ts in the remote key resource	2015-04-29 11:57:26 +01:00
Erik Johnston	a08bf11138	Appease PEP8	2015-04-29 11:44:48 +01:00
Erik Johnston	204132a998	Check that postgres database has correct charset set	2015-04-29 11:42:28 +01:00
Mark Haines	f4c9ebbc34	Delete ugly commented out log line.	2015-04-29 11:07:13 +01:00
Matthew Hodgson	68c0603946	comment out ugly test logline	2015-04-29 00:14:44 +01:00
Erik Johnston	1783c7ca92	Ensure we never miss any presence updates	2015-04-28 17:24:24 +01:00
Erik Johnston	0126ef7f3c	Fix typo	2015-04-28 17:23:53 +01:00
Erik Johnston	d98edb548a	Ensure the serial returned by presence is always an integer	2015-04-28 17:20:32 +01:00
Erik Johnston	073b891ec1	Remove unused imports	2015-04-28 13:44:23 +01:00
Erik Johnston	327ca883ec	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-28 13:39:42 +01:00
Erik Johnston	18f8247701	Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except for a limit	2015-04-28 12:41:33 +01:00
Mark Haines	9182f87664	Merge pull request #126 from matrix-org/csauth ... Client / Server Auth Refactor	2015-04-28 11:00:27 +01:00
Mark Haines	55e1bc8920	And don't bump the schema version unnecessarily	2015-04-28 10:54:15 +01:00
Mark Haines	55fcf62e9c	Merge pull request #133 from matrix-org/invite_power_level ... Invite power level	2015-04-28 10:50:34 +01:00
Mark Haines	b96c133034	Add server_keys.sql to the current delta rather than creating a new delta	2015-04-28 10:50:00 +01:00
Mark Haines	252e6f6869	Merge pull request #130 from matrix-org/server_rename_check ... Fix for SYN-266	2015-04-28 10:39:31 +01:00
Mark Haines	0bc71103e1	Output vim style mode markers into the yaml config file	2015-04-28 10:17:10 +01:00
Mark Haines	f8b865264a	Merge branch 'develop' into key_distribution ... Conflicts: synapse/crypto/keyring.py	2015-04-27 18:29:32 +01:00
Paul "LeoNerd" Evans	38432d8c25	Merge branch 'develop' into invite_power_level	2015-04-27 17:09:25 +01:00
Erik Johnston	42b7139dec	Remove unused import	2015-04-27 15:59:56 +01:00
Erik Johnston	1ef66cc3bd	Move database configuration into config module	2015-04-27 15:57:43 +01:00
Erik Johnston	416a3e6c4f	Ensure check_same_thread is enabled for sqlite3	2015-04-27 15:44:30 +01:00
Erik Johnston	8558e1ec73	Make get_max_token into inlineCallbacks so that the lock works.	2015-04-27 15:19:44 +01:00