35aec19f0a 
								
							
								 
							
						 
						
							
							
								
								Destination is a string  
							
							
							
						 
						
							2018-09-18 15:29:30 -06:00  
				
					
						
							
							
								 
						
							
							
								a219ce8726 
								
									
								
							
								 
							
						 
						
							
							
								
								Use directory server for room joins ( #3899 )  
							
							... 
							
							
							
							When we do a join, always try the server we used for the alias lookup first.
Fixes  #2418  
							
						 
						
							2018-09-18 18:27:37 +01:00  
				
					
						
							
							
								 
						
							
							
								31c15dcb80 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor matrixfederationclient to fix logging ( #3906 )  
							
							... 
							
							
							
							We want to wait until we have read the response body before we log the request
as complete, otherwise a confusing thing happens where the request appears to
have completed, but we later fail it.
To do this, we factor the salient details of a request out to a separate
object, which can then keep track of the txn_id, so that it can be logged. 
							
						 
						
							2018-09-18 18:17:15 +01:00  
				
					
						
							
							
								 
						
							
							
								c600886d47 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3894  from matrix-org/hs/phone_home_py_version  
							
							... 
							
							
							
							Add python_version phone home stat 
							
						 
						
							2018-09-19 02:40:04 +10:00  
				
					
						
							
							
								 
						
							
							
								286d6930b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3879  from matrix-org/matthew/fix-autojoin  
							
							... 
							
							
							
							don't ratelimit autojoins 
							
						 
						
							2018-09-18 13:07:01 +01:00  
				
					
						
							
							
								 
						
							
							
								1e09a1d48a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3889  from matrix-org/rav/404_on_remove_unknown_alias  
							
							... 
							
							
							
							Return a 404 when deleting unknown room alias 
							
						 
						
							2018-09-18 12:59:30 +01:00  
				
					
						
							
							
								 
						
							
							
								5baa087312 
								
									
								
							
								 
							
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2018-09-17 17:37:56 +01:00  
				
					
						
							
							
								 
						
							
							
								b58714789f 
								
									
								
							
								 
							
						 
						
							
							
								
								make pip happy?  
							
							
							
						 
						
							2018-09-17 17:35:54 +01:00  
				
					
						
							
							
								 
						
							
							
								ac80cb08fe 
								
							
								 
							
						 
						
							
							
								
								Fix more b'abcd' noise in metrics  
							
							
							
						 
						
							2018-09-17 17:16:50 +01:00  
				
					
						
							
							
								 
						
							
							
								9a1cceeca9 
								
									
								
							
								 
							
						 
						
							
							
								
								Use a string for versions  
							
							
							
						 
						
							2018-09-17 17:09:06 +01:00  
				
					
						
							
							
								 
						
							
							
								f75b9961c6 
								
							
								 
							
						 
						
							
							
								
								Reinstate missing null check  
							
							
							
						 
						
							2018-09-17 16:52:02 +01:00  
				
					
						
							
							
								 
						
							
							
								2b39494cd5 
								
									
								
							
								 
							
						 
						
							
							
								
								Add python_version phone home stat  
							
							
							
						 
						
							2018-09-17 16:35:18 +01:00  
				
					
						
							
							
								 
						
							
							
								f00a9d2636 
								
							
								 
							
						 
						
							
							
								
								Fix some b'abcd' noise in logs and metrics  
							
							... 
							
							
							
							Python 3 compatibility: make sure that we decode some byte sequences before we
use them to create log lines and metrics labels. 
							
						 
						
							2018-09-17 16:15:42 +01:00  
				
					
						
							
							
								 
						
							
							
								85a43f4167 
								
							
								 
							
						 
						
							
							
								
								Return a 404 when deleting unknown room alias  
							
							... 
							
							
							
							As per https://github.com/matrix-org/matrix-doc/issues/1675 
Fixes https://github.com/matrix-org/synapse/issues/2782  
							
						 
						
							2018-09-17 13:19:00 +01:00  
				
					
						
							
							
								 
						
							
							
								d42d79e3c3 
								
							
								 
							
						 
						
							
							
								
								don't ratelimit autojoins  
							
							
							
						 
						
							2018-09-15 22:27:41 +01:00  
				
					
						
							
							
								 
						
							
							
								24efb2a70d 
								
							
								 
							
						 
						
							
							
								
								Fix timeout function  
							
							... 
							
							
							
							Turns out deferred.cancel sometimes throws, so we do that last to ensure
that we always do resolve the new deferred. 
							
						 
						
							2018-09-15 11:38:39 +01:00  
				
					
						
							
							
								 
						
							
							
								fcfe7a850d 
								
							
								 
							
						 
						
							
							
								
								Add an awful secondary timeout to fix wedged requests  
							
							... 
							
							
							
							This is an attempt to mitigate #3842  by adding yet-another-timeout 
							
						 
						
							2018-09-14 19:23:07 +01:00  
				
					
						
							
							
								 
						
							
							
								024be6cf18 
								
									
								
							
								 
							
						 
						
							
							
								
								don't filter membership events based on history visibility ( #3874 )  
							
							... 
							
							
							
							don't filter membership events based on history visibility
as we will already have filtered the messages in the timeline, and state events
are always visible.
and because @erikjohnston said so. 
							
						 
						
							2018-09-14 18:12:52 +01:00  
				
					
						
							
							
								 
						
							
							
								3e6e94fe9f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3872  from matrix-org/hawkowl/timeouts-2  
							
							... 
							
							
							
							timeouts 2: electric boogaloo 
							
						 
						
							2018-09-14 16:58:44 +01:00  
				
					
						
							
							
								 
						
							
							
								bc9af88a2d 
								
							
								 
							
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2018-09-15 00:26:00 +10:00  
				
					
						
							
							
								 
						
							
							
								d0f6c1ce21 
								
							
								 
							
						 
						
							
							
								
								Remove spurious comment  
							
							
							
						 
						
							2018-09-14 15:12:36 +01:00  
				
					
						
							
							
								 
						
							
							
								9e2f9a7b57 
								
							
								 
							
						 
						
							
							
								
								Measure outbound requests  
							
							
							
						 
						
							2018-09-14 15:11:26 +01:00  
				
					
						
							
							
								 
						
							
							
								0a81038ea0 
								
							
								 
							
						 
						
							
							
								
								Add in flight real time metrics for Measure blocks  
							
							
							
						 
						
							2018-09-14 15:08:37 +01:00  
				
					
						
							
							
								 
						
							
							
								c971aa7b9d 
								
							
								 
							
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2018-09-14 03:57:02 +10:00  
				
					
						
							
							
								 
						
							
							
								8f08d848f5 
								
							
								 
							
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2018-09-14 03:53:56 +10:00  
				
					
						
							
							
								 
						
							
							
								f1a7264663 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix minor typo in exception  
							
							
							
						 
						
							2018-09-13 11:51:12 -06:00  
				
					
						
							
							
								 
						
							
							
								7c33ab76da 
								
							
								 
							
						 
						
							
							
								
								redact better  
							
							
							
						 
						
							2018-09-14 03:45:34 +10:00  
				
					
						
							
							
								 
						
							
							
								63755fa4c2 
								
							
								 
							
						 
						
							
							
								
								we do that higher up  
							
							
							
						 
						
							2018-09-14 03:21:47 +10:00  
				
					
						
							
							
								 
						
							
							
								73884ebac5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2  
							
							
							
						 
						
							2018-09-14 03:11:25 +10:00  
				
					
						
							
							
								 
						
							
							
								7c27c4d51c 
								
									
								
							
								 
							
						 
						
							
							
								
								merge ( #3576 )  
							
							
							
						 
						
							2018-09-14 03:11:11 +10:00  
				
					
						
							
							
								 
						
							
							
								1c3f4d9ca5 
								
							
								 
							
						 
						
							
							
								
								buffer?  
							
							
							
						 
						
							2018-09-14 03:09:13 +10:00  
				
					
						
							
							
								 
						
							
							
								6c0f8d9d50 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3856  from matrix-org/erikj/speed_up_purge  
							
							... 
							
							
							
							Make purge history slightly faster 
							
						 
						
							2018-09-13 16:14:46 +01:00  
				
					
						
							
							
								 
						
							
							
								ed5331a627 
								
							
								 
							
						 
						
							
							
								
								comment  
							
							
							
						 
						
							2018-09-13 16:10:56 +01:00  
				
					
						
							
							
								 
						
							
							
								89a76d1889 
								
							
								 
							
						 
						
							
							
								
								Fix handling of redacted events from federation  
							
							... 
							
							
							
							If we receive an event that doesn't pass their content hash check (e.g.
due to already being redacted) then we hit a bug which causes an
exception to be raised, which then promplty stops the event (and
request) from being processed.
This effects all sorts of federation APIs, including joining rooms with
a redacted state event. 
							
						 
						
							2018-09-13 15:44:12 +01:00  
				
					
						
							
							
								 
						
							
							
								bfa0b759e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Attempt to figure out what's going on with timeouts ( #3857 )  
							
							
							
						 
						
							2018-09-14 00:15:51 +10:00  
				
					
						
							
							
								 
						
							
							
								9cbd0094f0 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							
							
						 
						
							2018-09-13 15:15:35 +01:00  
				
					
						
							
							
								 
						
							
							
								9dbe38ea7d 
								
							
								 
							
						 
						
							
							
								
								Create indices after insertion  
							
							
							
						 
						
							2018-09-13 15:05:52 +01:00  
				
					
						
							
							
								 
						
							
							
								93139a1fb8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_purge  
							
							
							
						 
						
							2018-09-13 12:57:09 +01:00  
				
					
						
							
							
								 
						
							
							
								c857f5ef9b 
								
							
								 
							
						 
						
							
							
								
								Make purge history slightly faster  
							
							... 
							
							
							
							Don't pull out events that are outliers and won't be deleted, as nothing
should happen to them. 
							
						 
						
							2018-09-13 12:48:10 +01:00  
				
					
						
							
							
								 
						
							
							
								b7d2fb5eb9 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove some superfluous logging ( #3855 )  
							
							
							
						 
						
							2018-09-13 19:59:32 +10:00  
				
					
						
							
							
								 
						
							
							
								f30a303590 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3846  from matrix-org/neilj/expose-registered-users  
							
							... 
							
							
							
							expose number of real reserved users 
							
						 
						
							2018-09-12 17:14:04 +01:00  
				
					
						
							
							
								 
						
							
							
								2ac1abbc7e 
								
									
								
							
								 
							
						 
						
							
							
								
								show heroes if a room has a 'deleted' name/canonical_alias ( #3851 )  
							
							
							
						 
						
							2018-09-12 17:11:05 +01:00  
				
					
						
							
							
								 
						
							
							
								fa0d464fa4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3853  from matrix-org/erikj/log_outbound_each_time  
							
							... 
							
							
							
							Log outbound requests when we retry 
							
						 
						
							2018-09-12 16:55:40 +01:00  
				
					
						
							
							
								 
						
							
							
								0403cf0783 
								
							
								 
							
						 
						
							
							
								
								argh pep8  
							
							
							
						 
						
							2018-09-12 16:54:28 +01:00  
				
					
						
							
							
								 
						
							
							
								0e200e366d 
								
							
								 
							
						 
						
							
							
								
								correctly log gappy sync metrics  
							
							
							
						 
						
							2018-09-12 16:47:20 +01:00  
				
					
						
							
							
								 
						
							
							
								11bfc2af1c 
								
							
								 
							
						 
						
							
							
								
								fix logline  
							
							
							
						 
						
							2018-09-12 16:45:42 +01:00  
				
					
						
							
							
								 
						
							
							
								8decd6233d 
								
							
								 
							
						 
						
							
							
								
								improve naming  
							
							
							
						 
						
							2018-09-12 16:22:15 +01:00  
				
					
						
							
							
								 
						
							
							
								8c5b84441b 
								
							
								 
							
						 
						
							
							
								
								Log outbound requests when we retry  
							
							
							
						 
						
							2018-09-12 16:22:14 +01:00  
				
					
						
							
							
								 
						
							
							
								54f8616d2c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3841  from matrix-org/erikj/manhole_key_length  
							
							... 
							
							
							
							Change the manhole SSH key to have more bits 
							
						 
						
							2018-09-12 14:33:39 +01:00  
				
					
						
							
							
								 
						
							
							
								7ca097f77e 
								
									
								
							
								 
							
						 
						
							
							
								
								Port federation/ to py3 ( #3847 )  
							
							
							
						 
						
							2018-09-12 23:23:32 +10:00