3811 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	22c7c5eb8f	Typo	2015-05-01 14:41:25 +01:00
Erik Johnston	42c12c04f6	Remove some run_on_reactors	2015-05-01 14:41:25 +01:00
Erik Johnston	adb5b76ff5	Don't log all auth events every time we call auth.check	2015-05-01 14:41:25 +01:00
Mark Haines	3bcdf3664c	Use the daemonize key from the config if it exists	2015-05-01 14:34:55 +01:00
David Baker	9eeb03c0dd	Don't use self.execute: it's designed for fetching stuff	2015-05-01 14:21:25 +01:00
Mark Haines	32937f3ea0	database config is not kept in separate config file anymore	2015-05-01 14:06:54 +01:00
Mark Haines	7b50769eb9	Merge pull request #136 from matrix-org/markjh/config_cleanup ... Config restructuring.	2015-05-01 14:04:39 +01:00
David Baker	7693f24792	No id field on user	2015-05-01 13:55:42 +01:00
Mark Haines	46a65c282f	Allow generate-config to run against an existing config file to generate default keys	2015-05-01 13:54:38 +01:00
David Baker	92b20713d7	More missed get_user_by_id API changes	2015-05-01 13:45:54 +01:00
Erik Johnston	da4ed08739	One too many lens	2015-05-01 13:29:38 +01:00
Erik Johnston	9060dc6b59	Change public room list to use defer.gatherResults	2015-05-01 13:28:36 +01:00
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	4ad8350607	Update README.rst	2015-04-30 17:48:29 +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	069296dbb0	Can't specify bind-port on the cmdline anymore	2015-04-30 17:08:07 +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