Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6ea27fafad 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							 
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e05bf34117 
								
							
								 
							
						 
						
							
							
								
								Move property setting from ReplicationLayer to FederationBase  
							
							 
							
							
							
						 
						
							2018-03-13 10:51:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								631a73f7ef 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-03-13 10:39:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c3f79c9da5 
								
							
								 
							
						 
						
							
							
								
								Split out edu/query registration to a separate class  
							
							 
							
							
							
						 
						
							2018-03-13 10:24:27 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								d65ceb4b48 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2962  from matrix-org/rav/purge_history_txns  
							
							 
							
							... 
							
							
							
							Add transactional API to history purge 
							
						 
						
							2018-03-12 16:32:18 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e48c7aac4d 
								
							
								 
							
						 
						
							
							
								
								Add transactional API to history purge  
							
							 
							
							... 
							
							
							
							Make the purge request return quickly, and allow scripts to poll for updates. 
							
						 
						
							2018-03-12 16:22:55 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1708412f56 
								
							
								 
							
						 
						
							
							
								
								Return an error when doing two purges on a room  
							
							 
							
							... 
							
							
							
							Queuing up purges doesn't sound like a good thing. 
							
						 
						
							2018-03-12 16:22:54 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								b984dd0b73 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2961  from matrix-org/rav/run_in_background  
							
							 
							
							... 
							
							
							
							Factor run_in_background out from preserve_fn 
							
						 
						
							2018-03-12 16:19:13 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								ba1d08bc4b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2965  from matrix-org/rav/request_logging  
							
							 
							
							... 
							
							
							
							Add a metric which increments when a request is received 
							
						 
						
							2018-03-12 09:45:33 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								58dd148c4f 
								
							
								 
							
						 
						
							
							
								
								Add some docstrings to help figure this out  
							
							 
							
							
							
						 
						
							2018-03-09 18:05:41 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								88541f9009 
								
							
								 
							
						 
						
							
							
								
								Add a metric which increments when a request is received  
							
							 
							
							... 
							
							
							
							It's useful to know when there are peaks in incoming requests - which isn't
quite the same as there being peaks in outgoing responses, due to the time
taken to handle requests. 
							
						 
						
							2018-03-09 16:30:26 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dbe80a286b 
								
							
								 
							
						 
						
							
							
								
								refactor JsonResource  
							
							 
							
							... 
							
							
							
							rephrase the OPTIONS and unrecognised request handling so that they look
similar to the common flow. 
							
						 
						
							2018-03-09 16:22:16 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								20f40348d4 
								
							
								 
							
						 
						
							
							
								
								Factor run_in_background out from preserve_fn  
							
							 
							
							... 
							
							
							
							It annoys me that we create temporary function objects when there's really no
need for it. Let's factor the gubbins out of preserve_fn and start using it. 
							
						 
						
							2018-03-08 11:50:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								735fd8719a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2944  from matrix-org/erikj/fix_sync_race  
							
							 
							
							... 
							
							
							
							Fix race in sync when joining room 
							
						 
						
							2018-03-07 17:42:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a56d54dcb7 
								
							
								 
							
						 
						
							
							
								
								Fix up log message  
							
							 
							
							
							
						 
						
							2018-03-07 11:55:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02a1296ad6 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2018-03-07 11:55:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8cb44da4aa 
								
							
								 
							
						 
						
							
							
								
								Fix race in sync when joining room  
							
							 
							
							... 
							
							
							
							The race happens when the user joins a room at the same time as doing a
sync. We fetch the current token and then get the rooms the user is in.
If the join happens after the current token, but before we get the rooms
we end up sending down a partial room entry in the sync.
This is fixed by looking at the stream ordering of the membership
returned by get_rooms_for_user, and handling the case when that stream
ordering is after the current token. 
							
						 
						
							2018-03-07 11:55:31 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ffaacbee3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2949  from krombel/use_bcrypt_checkpw  
							
							 
							
							... 
							
							
							
							use bcrypt.checkpw 
							
						 
						
							2018-03-06 11:56:06 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								b2932107bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2946  from matrix-org/rav/timestamp_to_purge  
							
							 
							
							... 
							
							
							
							Implement purge_history by timestamp 
							
						 
						
							2018-03-06 11:20:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								7aed50a038 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2948  from matrix-org/erikj/kill_as_sync  
							
							 
							
							... 
							
							
							
							Remove ability for AS users to call /events and /sync 
							
						 
						
							2018-03-06 11:10:09 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b6c4b851f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2947  from matrix-org/erikj/split_directory_store  
							
							 
							
							... 
							
							
							
							Split Directory store 
							
						 
						
							2018-03-05 18:17:32 +00:00  
						
					 
				
					
						
							
							
								 
								Krombel
							
						 
						
							 
							
							
							
								
							
								ed9b5eced4 
								
							
								 
							
						 
						
							
							
								
								use bcrypt.checkpw  
							
							 
							
							... 
							
							
							
							in bcrypt 3.1.0 checkpw got introduced (already 2 years ago)
This makes use of that with enhancements which might get introduced
by that
Signed-Off-by: Matthias Kesler <krombel@krombel.de> 
							
						 
						
							2018-03-05 18:02:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d4ffe61d4f 
								
							
								 
							
						 
						
							
							
								
								Remove ability for AS users to call /events and /sync  
							
							 
							
							... 
							
							
							
							This functionality has been deprecated for a while as well as being
broken for a while. Instead of fixing it lets just remove it entirely.
See: https://github.com/matrix-org/matrix-doc/issues/1144  
							
						 
						
							2018-03-05 15:44:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								69ce365b79 
								
							
								 
							
						 
						
							
							
								
								Fix cache invalidation on deletion  
							
							 
							
							
							
						 
						
							2018-03-05 15:29:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2e223163ff 
								
							
								 
							
						 
						
							
							
								
								Split Directory store  
							
							 
							
							
							
						 
						
							2018-03-05 15:11:30 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f8bfcd7e0d 
								
							
								 
							
						 
						
							
							
								
								Provide a means to pass a timestamp to purge_history  
							
							 
							
							
							
						 
						
							2018-03-05 14:37:23 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								d032785aa7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2943  from matrix-org/rav/fix_find_first_stream_ordering_after_ts  
							
							 
							
							... 
							
							
							
							Test and fix find_first_stream_ordering_after_ts 
							
						 
						
							2018-03-05 12:26:14 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2c911d75e8 
								
							
								 
							
						 
						
							
							
								
								Fix comment typo  
							
							 
							
							
							
						 
						
							2018-03-05 12:24:49 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c818fcab11 
								
							
								 
							
						 
						
							
							
								
								Test and fix find_first_stream_ordering_after_ts  
							
							 
							
							... 
							
							
							
							It seemed to suffer from a bunch of off-by-one errors. 
							
						 
						
							2018-03-05 12:04:02 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								06a14876e5 
								
							
								 
							
						 
						
							
							
								
								Add find_first_stream_ordering_after_ts  
							
							 
							
							... 
							
							
							
							Expose this as a public function which can be called outside a txn 
							
						 
						
							2018-03-05 11:53:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								42174946f8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2934  from matrix-org/erikj/cache_fix  
							
							 
							
							... 
							
							
							
							Fix bug with delayed cache invalidation stream 
							
						 
						
							2018-03-05 11:33:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								f394f5574d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2929  from matrix-org/erikj/split_regististration_store  
							
							 
							
							... 
							
							
							
							Split registration store 
							
						 
						
							2018-03-05 11:33:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								efb79820b4 
								
							
								 
							
						 
						
							
							
								
								Fix bug with delayed cache invalidation stream  
							
							 
							
							... 
							
							
							
							We poked the notifier before updated the current token for the cache
invalidation stream. This mean that sometimes the update wouldn't be
sent until the next time a cache was invalidated. 
							
						 
						
							2018-03-02 14:45:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fafa3e7114 
								
							
								 
							
						 
						
							
							
								
								Split registration store  
							
							 
							
							
							
						 
						
							2018-03-02 13:48:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								6619f047ad 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2933  from matrix-org/erikj/3pid_yield  
							
							 
							
							... 
							
							
							
							Add missing yield during 3pid signature checks 
							
						 
						
							2018-03-02 11:31:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d960d23830 
								
							
								 
							
						 
						
							
							
								
								Add missing yield during 3pid signature checks  
							
							 
							
							
							
						 
						
							2018-03-02 11:03:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								1a6c7cdf54 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2928  from matrix-org/erikj/read_marker_caches  
							
							 
							
							... 
							
							
							
							Fix typo in getting replication account data processing 
							
						 
						
							2018-03-01 17:56:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								89b7232ff8 
								
							
								 
							
						 
						
							
							
								
								Fix typo in getting replication account data processing  
							
							 
							
							
							
						 
						
							2018-03-01 17:50:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								1773df0632 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2925  from matrix-org/erikj/split_sig_fed  
							
							 
							
							... 
							
							
							
							Split out SignatureStore and EventFederationStore 
							
						 
						
							2018-03-01 17:32:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65cf454fd1 
								
							
								 
							
						 
						
							
							
								
								Remove unused DataStore  
							
							 
							
							
							
						 
						
							2018-03-01 17:27:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								9e08a93a7b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2927  from matrix-org/erikj/read_marker_caches  
							
							 
							
							... 
							
							
							
							Improve caching for read_marker API 
							
						 
						
							2018-03-01 17:12:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4b44f05f19 
								
							
								 
							
						 
						
							
							
								
								Fewer lies are better  
							
							 
							
							
							
						 
						
							2018-03-01 17:08:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a83c514d1f 
								
							
								 
							
						 
						
							
							
								
								Improve caching for read_marker API  
							
							 
							
							... 
							
							
							
							We add a new storage function to get a paritcular type of room account
data. This allows us to prefill the cache when updating that acount
data. 
							
						 
						
							2018-03-01 17:08:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								33bebb63f3 
								
							
								 
							
						 
						
							
							
								
								Add some caches to help read marker API  
							
							 
							
							
							
						 
						
							2018-03-01 17:08:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								483e8104db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2926  from matrix-org/erikj/member_handler_move  
							
							 
							
							... 
							
							
							
							Move RoomMemberHandler out of Handlers 
							
						 
						
							2018-03-01 17:01:25 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2ad4d5b5bb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_sig_fed  
							
							 
							
							
							
						 
						
							2018-03-01 16:59:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								92789199a9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2924  from matrix-org/erikj/split_stream_store  
							
							 
							
							... 
							
							
							
							Split out stream store 
							
						 
						
							2018-03-01 16:56:37 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								529c026ac1 
								
							
								 
							
						 
						
							
							
								
								Move back to hs.is_mine  
							
							 
							
							
							
						 
						
							2018-03-01 16:49:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7c371834cc 
								
							
								 
							
						 
						
							
							
								
								Stub out broken function only used for cache  
							
							 
							
							
							
						 
						
							2018-03-01 16:44:13 +00:00