Mark Haines
							
						 
						
							 
							
							
							
								
							
								1967650bc4 
								
							
								 
							
						 
						
							
							
								
								Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator  
							
							 
							
							
							
						 
						
							2015-04-21 16:35:53 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1ebff9736b 
								
							
								 
							
						 
						
							
							
								
								Split out the JsonResource request logging and error handling into a separate wrapper function  
							
							 
							
							
							
						 
						
							2015-04-21 16:07:20 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3cbc286d06 
								
							
								 
							
						 
						
							
							
								
								Move server key api into rest/key/v1  
							
							 
							
							
							
						 
						
							2015-04-14 13:28:11 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed4d44d833 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #109  from matrix-org/default_registration  
							
							 
							
							... 
							
							
							
							Disable registration by default. Add script to register new users. 
							
						 
						
							2015-03-18 11:38:52 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								3f7a31d366 
								
							
								 
							
						 
						
							
							
								
								Add a DistributionMetric to HTTP request/response processing time in the server  
							
							 
							
							
							
						 
						
							2015-03-16 18:31:29 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								c8032aec17 
								
							
								 
							
						 
						
							
							
								
								actually uphold the bind_host parameter. in theory should make ipv6 binds work like bind_host: 'fe80::1%lo0'  
							
							 
							
							
							
						 
						
							2015-03-14 00:12:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dea236e4fa 
								
							
								 
							
						 
						
							
							
								
								Add missing commas  
							
							 
							
							
							
						 
						
							2015-03-13 15:24:03 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								128cf2daf7 
								
							
								 
							
						 
						
							
							
								
								Appease pep8  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1748605c5d 
								
							
								 
							
						 
						
							
							
								
								Count incoming HTTP requests per servlet that responds  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b0cf867319 
								
							
								 
							
						 
						
							
							
								
								Use _ instead of . as a metric namespacing separator, for Prometheus  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f9478e475b 
								
							
								 
							
						 
						
							
							
								
								Rename Metrics' "keys" to "labels"  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								7d72e44eb9 
								
							
								 
							
						 
						
							
							
								
								Add vector counters to HTTP clients and servers; count the requests by method and responses by method and response code  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								c53ec53d80 
								
							
								 
							
						 
						
							
							
								
								Pull out all uses of the underlying HTTP user agent .request() method into a single wrapper function, to make adding metrics easier  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								9d9d39536b 
								
							
								 
							
						 
						
							
							
								
								Slightly reduce the insane amounts of indentation in main http server response path, by 'continue'ing around a non-match or falling through  
							
							 
							
							
							
						 
						
							2015-03-05 16:24:13 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2de5b14fe0 
								
							
								 
							
						 
						
							
							
								
								Fix bug which prevented the HS pushing events to the AS due to FrozenEvents  
							
							 
							
							
							
						 
						
							2015-03-02 15:36:37 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7025781df8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1  
							
							 
							
							
							
						 
						
							2015-02-18 17:37:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3f1871021e 
								
							
								 
							
						 
						
							
							
								
								Make /keys/ return correct Server version  
							
							 
							
							
							
						 
						
							2015-02-18 17:32:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5358966a87 
								
							
								 
							
						 
						
							
							
								
								Use git aware version string in User-Agent and Server headers  
							
							 
							
							
							
						 
						
							2015-02-18 16:52:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7e9d59f3b4 
								
							
								 
							
						 
						
							
							
								
								Don't convert DNSLookupError to a 4xx SynapseError  
							
							 
							
							
							
						 
						
							2015-02-18 10:58:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65ca713ff5 
								
							
								 
							
						 
						
							
							
								
								Add .__name__ after type(e)  
							
							 
							
							
							
						 
						
							2015-02-18 10:51:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5e24471469 
								
							
								 
							
						 
						
							
							
								
								Fix up ResponseNeverReceived to str  
							
							 
							
							
							
						 
						
							2015-02-18 10:50:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0db52d43fa 
								
							
								 
							
						 
						
							
							
								
								strings.join() expects iterable of strings  
							
							 
							
							
							
						 
						
							2015-02-18 10:41:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0647e27a41 
								
							
								 
							
						 
						
							
							
								
								Remove unused import  
							
							 
							
							
							
						 
						
							2015-02-17 15:19:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c02da58a9d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into failures  
							
							 
							
							
							
						 
						
							2015-02-17 15:15:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4de93001bf 
								
							
								 
							
						 
						
							
							
								
								Make matrixfederationclient log more nicely  
							
							 
							
							
							
						 
						
							2015-02-17 15:12:06 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0d872f5aa6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from matrix-org/application-services  
							
							 
							
							... 
							
							
							
							Application Services 
							
						 
						
							2015-02-13 15:06:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2bf0e85f3d 
								
							
								 
							
						 
						
							
							
								
								Use encode_canonical_json for http client  
							
							 
							
							
							
						 
						
							2015-02-11 17:34:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c52e8d395b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #61  from matrix-org/timeout-federation-requests  
							
							 
							
							... 
							
							
							
							Timeout federation requests 
							
						 
						
							2015-02-11 17:10:33 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f2fdcb7c4b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-11 16:43:26 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f518324426 
								
							
								 
							
						 
						
							
							
								
								Minor tweaks based on PR feedback.  
							
							 
							
							
							
						 
						
							2015-02-11 16:41:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								41a9a76a99 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests  
							
							 
							
							
							
						 
						
							2015-02-11 16:12:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ebbaf0d43 
								
							
								 
							
						 
						
							
							
								
								Blunty replace json with simplejson  
							
							 
							
							
							
						 
						
							2015-02-11 14:23:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6370cffbbf 
								
							
								 
							
						 
						
							
							
								
								Fix bug where variable was not always defined  
							
							 
							
							
							
						 
						
							2015-02-11 10:34:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fb233dc40b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests  
							
							 
							
							
							
						 
						
							2015-02-11 10:33:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								05b961d7e3 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2015-02-11 10:28:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dcf52469e8 
								
							
								 
							
						 
						
							
							
								
								Move time_bound_deferred into Clock  
							
							 
							
							
							
						 
						
							2015-02-11 10:25:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0e6b3e4e40 
								
							
								 
							
						 
						
							
							
								
								Time out HTTP federation requests  
							
							 
							
							
							
						 
						
							2015-02-10 18:17:27 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								53557fc532 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-09 15:20:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24cc6979fb 
								
							
								 
							
						 
						
							
							
								
								Log when we receive a request, when we send a response and how long it took to process it.  
							
							 
							
							
							
						 
						
							2015-02-09 13:46:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9f2573eea1 
								
							
								 
							
						 
						
							
							
								
								Return body of response in HttpResponseException  
							
							 
							
							
							
						 
						
							2015-02-06 10:55:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								951690e54d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-05 14:28:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								543e84fe70 
								
							
								 
							
						 
						
							
							
								
								Add SimpleHttpClient.put_json with the same semantics as get_json.  
							
							 
							
							
							
						 
						
							2015-02-04 17:39:51 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								6d3e4f4d0a 
								
							
								 
							
						 
						
							
							
								
								Update user/alias query APIs to use new format of SimpleHttpClient.get_json  
							
							 
							
							
							
						 
						
							2015-02-04 17:32:44 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								96d4bf9012 
								
							
								 
							
						 
						
							
							
								
								Modify API for SimpleHttpClient.get_json and update usages.  
							
							 
							
							... 
							
							
							
							Previously, this would only return the HTTP body as JSON, and discard other
response information (e.g. the HTTP response code). This has now been changed
to throw a CodeMessageException on a non-2xx response, with the response code
and body, which can then be parsed as JSON.
Affected modules include:
 - Registration/Login (when using an email for IS auth) 
							
						 
						
							2015-02-04 17:07:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae46f10fc5 
								
							
								 
							
						 
						
							
							
								
								Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations  
							
							 
							
							
							
						 
						
							2015-02-04 16:28:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2ebf795c0a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into rejections  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql 
							
						 
						
							2015-01-30 11:10:37 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5a3a15f5c1 
								
							
								 
							
						 
						
							
							
								
								Make post_json(...) actually send data.  
							
							 
							
							
							
						 
						
							2015-01-29 13:58:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c183cec8f6 
								
							
								 
							
						 
						
							
							
								
								Add post_json(...) method to federation client  
							
							 
							
							
							
						 
						
							2015-01-29 13:44:52 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c291a4d522 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/events.py
	synapse/server.py 
							
						 
						
							2015-01-28 12:51:05 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7b814d3f7f 
								
							
								 
							
						 
						
							
							
								
								Add client v2_alpha resource to synapse server resource tree  
							
							 
							
							
							
						 
						
							2015-01-23 18:55:19 +00:00