Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								32e7c9e7f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Black. ( #5482 )  
							
							 
							
							
							
						 
						
							2019-06-20 19:32:02 +10:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								4a4d5c4fd6 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix grammar and document get_current_users_in_room ( #4998 )  
							
							 
							
							
							
						 
						
							2019-04-03 14:32:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c90422146 
								
							
								 
							
						 
						
							
							
								
								Pull out config option  
							
							 
							
							
							
						 
						
							2019-03-20 14:25:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7529038e66 
								
							
								 
							
						 
						
							
							
								
								Return before we log  
							
							 
							
							
							
						 
						
							2019-03-20 14:25:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								213c98c00a 
								
							
								 
							
						 
						
							
							
								
								Add option to disable search room lists  
							
							 
							
							... 
							
							
							
							This disables both local and remote room list searching. 
							
						 
						
							2019-03-19 17:10:52 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								802884d4ee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate_develop  
							
							 
							
							
							
						 
						
							2019-02-26 14:23:40 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6fcb25202f 
								
							
								 
							
						 
						
							
							
								
								Put function def back to the way it was  
							
							 
							
							
							
						 
						
							2019-02-26 14:17:38 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								7a4632af9c 
								
							
								 
							
						 
						
							
							
								
								Prevent showing non-fed rooms in fed /publicRooms  
							
							 
							
							
							
						 
						
							2019-02-26 13:37:24 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								c74624a633 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Prevent showing non-fed rooms in fed /publicRooms"  
							
							 
							
							
							
						 
						
							2019-02-26 13:20:38 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c4414768af 
								
							
								 
							
						 
						
							
							
								
								Cleaner chunk logic  
							
							 
							
							
							
						 
						
							2019-02-26 12:22:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								a712aa3a9c 
								
							
								 
							
						 
						
							
							
								
								Correct indent  
							
							 
							
							
							
						 
						
							2019-02-26 12:13:55 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								16565e67db 
								
							
								 
							
						 
						
							
							
								
								Correct docstring types and chunk logic  
							
							 
							
							
							
						 
						
							2019-02-26 12:12:48 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								40c2271680 
								
							
								 
							
						 
						
							
							
								
								Clean up room chunk logic  
							
							 
							
							
							
						 
						
							2019-02-26 12:04:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6728bf3940 
								
							
								 
							
						 
						
							
							
								
								Make not showing non-federated rooms the default  
							
							 
							
							
							
						 
						
							2019-02-26 11:52:52 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6946c20111 
								
							
								 
							
						 
						
							
							
								
								Result may be None  
							
							 
							
							
							
						 
						
							2019-02-26 11:27:19 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								71669a0fba 
								
							
								 
							
						 
						
							
							
								
								Address rich comments  
							
							 
							
							
							
						 
						
							2019-02-26 11:25:00 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								1330aa4a8f 
								
							
								 
							
						 
						
							
							
								
								elif not else if  
							
							 
							
							
							
						 
						
							2019-02-25 17:28:19 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								8aaf7ffc44 
								
							
								 
							
						 
						
							
							
								
								syntax derp  
							
							 
							
							
							
						 
						
							2019-02-25 15:27:17 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								84c0a20dfe 
								
							
								 
							
						 
						
							
							
								
								Simplify call to generate_room_entry  
							
							 
							
							
							
						 
						
							2019-02-25 15:23:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4b9e5076c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate  
							
							 
							
							
							
						 
						
							2019-02-25 15:08:18 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								07493607a8 
								
							
								 
							
						 
						
							
							
								
								Docs and arg name clarification  
							
							 
							
							
							
						 
						
							2019-02-25 15:04:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								bd398b874e 
								
							
								 
							
						 
						
							
							
								
								Don't restrict non-fed rooms over client APIs  
							
							 
							
							
							
						 
						
							2019-02-25 15:04:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								e4b078a600 
								
							
								 
							
						 
						
							
							
								
								Config option to prevent showing non-fed rooms in fed /publicRooms  
							
							 
							
							
							
						 
						
							2019-02-25 15:04:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								075ff3ede9 
								
							
								 
							
						 
						
							
							
								
								Change default timeout value from 0 to None  
							
							 
							
							
							
						 
						
							2019-01-24 15:10:22 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								5b1dc94083 
								
							
								 
							
						 
						
							
							
								
								Use self.clock instead of datetime  
							
							 
							
							
							
						 
						
							2019-01-24 14:59:50 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								a2d85144e5 
								
							
								 
							
						 
						
							
							
								
								isort  
							
							 
							
							
							
						 
						
							2019-01-24 14:22:26 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								5541645e80 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2019-01-24 12:45:32 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								068aa1d228 
								
							
								 
							
						 
						
							
							
								
								Time out filtered room dir queries after 60s  
							
							 
							
							
							
						 
						
							2019-01-24 12:44:27 +00:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								d6a7797dd1 
								
							
								 
							
						 
						
							
							
								
								Fix roomlist since tokens on Python 3 ( #4046 )  
							
							 
							
							... 
							
							
							
							Thanks @Half-Shot !!! 
							
						 
						
							2018-10-17 23:04:55 +11:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								2608ebc04c 
								
									
								
							
								 
							
						 
						
							
							
								
								Port handlers/ to Python 3 ( #3803 )  
							
							 
							
							
							
						 
						
							2018-09-07 00:22:23 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								b37c472419 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )  
							
							 
							
							
							
						 
						
							2018-08-10 23:50:21 +10:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ba22b6a456 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							 
							
							
							
						 
						
							2018-07-13 12:03:39 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c936a52a9e 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )  
							
							 
							
							
							
						 
						
							2018-05-31 19:03:47 +10:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								d82b6ea9e6 
								
							
								 
							
						 
						
							
							
								
								Move more xrange to six  
							
							 
							
							... 
							
							
							
							plus a bonus next()
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-28 13:57:00 +02:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b78395b7fe 
								
							
								 
							
						 
						
							
							
								
								Refactor ResponseCache usage  
							
							 
							
							... 
							
							
							
							Adds a `.wrap` method to ResponseCache which wraps up the boilerplate of a
(get, set) pair, and then use it throughout the codebase.
This will be largely non-functional, but does include the following functional
changes:
* federation_server.on_context_state_request: drops use of _server_linearizer
  which looked redundant and could cause incorrect cache misses by yielding
  between the get and the set.
* RoomListHandler.get_remote_public_room_list(): fixes logcontext leaks
* the wrap function includes some logging. I'm hoping this won't be too noisy
  on production. 
							
						 
						
							2018-04-12 13:02:15 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b3384232a0 
								
							
								 
							
						 
						
							
							
								
								Add metrics for ResponseCache  
							
							 
							
							
							
						 
						
							2018-04-10 23:14:47 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cb9f8e527c 
								
							
								 
							
						 
						
							
							
								
								s/replication_client/federation_client/  
							
							 
							
							
							
						 
						
							2018-03-13 13:26:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							 
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								73560237d6 
								
							
								 
							
						 
						
							
							
								
								add white space line  
							
							 
							
							
							
						 
						
							2018-01-26 00:15:10 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								86c4f49a31 
								
							
								 
							
						 
						
							
							
								
								rather than try reconstruct the results object, better to guard against the xrange step argument being 0  
							
							 
							
							
							
						 
						
							2018-01-26 00:12:02 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								f632083576 
								
							
								 
							
						 
						
							
							
								
								fix return type, should be a dict  
							
							 
							
							
							
						 
						
							2018-01-25 23:52:17 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								6c6e197b0a 
								
							
								 
							
						 
						
							
							
								
								fix PEP8 violation  
							
							 
							
							
							
						 
						
							2018-01-25 23:47:46 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								d02e43b15f 
								
							
								 
							
						 
						
							
							
								
								remove white space  
							
							 
							
							
							
						 
						
							2018-01-25 23:29:46 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								349c739966 
								
							
								 
							
						 
						
							
							
								
								synapse 500s on a call to publicRooms in the case where the number of public rooms is zero, the specific cause is due to xrange trying to use a step value of zero, but if the total room number really is zero then it makes sense to just bail and save the extra processing  
							
							 
							
							
							
						 
						
							2018-01-25 23:28:44 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								44a1bfd6a6 
								
							
								 
							
						 
						
							
							
								
								Reshuffle room list request code  
							
							 
							
							... 
							
							
							
							I'm not entirely sure if this will actually help anything, but it simplifies
the code and might give further clues about why room list search requests are
blowing out the get_current_state_ids caches. 
							
						 
						
							2017-11-14 10:29:58 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1fc66c7460 
								
							
								 
							
						 
						
							
							
								
								Add a load of logging to the room_list handler  
							
							 
							
							... 
							
							
							
							So we can see what it gets up to. 
							
						 
						
							2017-11-14 10:23:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								566e21eac8 
								
							
								 
							
						 
						
							
							
								
								Update room_list.py  
							
							 
							
							
							
						 
						
							2017-10-26 11:39:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2a7e9faeec 
								
							
								 
							
						 
						
							
							
								
								Do logcontexts outside ResponseCache  
							
							 
							
							
							
						 
						
							2017-10-25 15:21:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								33a9026cdf 
								
							
								 
							
						 
						
							
							
								
								Add logging and fix log contexts for publicRooms  
							
							 
							
							
							
						 
						
							2017-10-25 10:26:06 +01:00