Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								68b0ee4e8d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3041  from matrix-org/r30_stats  
							
							 
							
							... 
							
							
							
							R30 stats 
							
						 
						
							2018-04-05 15:37:37 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0e5f479fc0 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							... 
							
							
							
							Use iteritems over item to loop over dict
formatting 
							
						 
						
							2018-04-05 12:16:46 +01:00  
						
					 
				
					
						
							
							
								 
								Jan Christian Grünhage
							
						 
						
							 
							
							
							
								
							
								e4570c53dd 
								
							
								 
							
						 
						
							
							
								
								phone home cache size configurations  
							
							 
							
							
							
						 
						
							2018-04-04 16:46:58 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								86932be2cb 
								
							
								 
							
						 
						
							
							
								
								Support multi client R30 for psql  
							
							 
							
							
							
						 
						
							2018-03-28 14:36:53 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
							
								
							
								33f6195d9a 
								
							
								 
							
						 
						
							
							
								
								Handle review comments  
							
							 
							
							
							
						 
						
							2018-03-28 14:25:25 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								792d340572 
								
							
								 
							
						 
						
							
							
								
								rename stat to future proof  
							
							 
							
							
							
						 
						
							2018-03-28 12:25:02 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
							
								
							
								4ceaa7433a 
								
							
								 
							
						 
						
							
							
								
								As daemonizing will make a new process, defer call to init.  
							
							 
							
							
							
						 
						
							2018-03-28 12:19:01 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								a32d2548d9 
								
							
								 
							
						 
						
							
							
								
								query and call for r30 stats  
							
							 
							
							
							
						 
						
							2018-03-28 10:39:13 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
							
								
							
								ef520d8d0e 
								
							
								 
							
						 
						
							
							
								
								Include coarse CPU and Memory use in stats callbacks.  
							
							 
							
							... 
							
							
							
							This requires the psutil module, and is still opt-in based on the report_stats
config option. 
							
						 
						
							2018-03-27 17:56:03 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8cbbfaefc1 
								
							
								 
							
						 
						
							
							
								
								404 correctly on missing paths via NoResource  
							
							 
							
							... 
							
							
							
							fixes https://github.com/matrix-org/synapse/issues/2043  and https://github.com/matrix-org/synapse/issues/2029  
							
						 
						
							2018-03-23 10:32:50 +00: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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24dd73028a 
								
							
								 
							
						 
						
							
							
								
								Add replication http endpoint for event sending  
							
							 
							
							
							
						 
						
							2018-02-07 10:32:32 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								25adde9a04 
								
							
								 
							
						 
						
							
							
								
								Factor out get_db_conn to HomeServer base class  
							
							 
							
							... 
							
							
							
							This function is identical to all subclasses, so we may as well push it up to
the base class to reduce duplication (and make use of it in the tests) 
							
						 
						
							2018-01-26 00:56:49 +00:00  
						
					 
				
					
						
							
							
								 
								Silke
							
						 
						
							 
							
							
							
								
							
								df0f602796 
								
							
								 
							
						 
						
							
							
								
								Implement listen_tcp method in remaining workers  
							
							 
							
							... 
							
							
							
							Signed-off-by: Silke <silke@slxh.eu> 
							
						 
						
							2017-12-18 20:00:42 +01:00  
						
					 
				
					
						
							
							
								 
								Silke
							
						 
						
							 
							
							
							
								
							
								26cd3f5690 
								
							
								 
							
						 
						
							
							
								
								Remove logger argument and do not catch replication listener  
							
							 
							
							... 
							
							
							
							Signed-off-by: Silke <silke@slxh.eu> 
							
						 
						
							2017-12-18 20:00:42 +01:00  
						
					 
				
					
						
							
							
								 
								Silke Hofstra
							
						 
						
							 
							
							
							
								
							
								ed48ecc58c 
								
							
								 
							
						 
						
							
							
								
								Add methods for listening on multiple addresses  
							
							 
							
							... 
							
							
							
							Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP
and reactor.listenSSL for multiple addresses.
Signed-off-by: Silke Hofstra <silke@slxh.eu> 
							
						 
						
							2017-12-17 13:15:48 +01:00  
						
					 
				
					
						
							
							
								 
								Silke Hofstra
							
						 
						
							 
							
							
							
								
							
								37d1a90025 
								
							
								 
							
						 
						
							
							
								
								Allow binds to both :: and 0.0.0.0  
							
							 
							
							... 
							
							
							
							Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed.
This causes a warning explaining the behaviour.
Configuration changed to match.
See #2232 
Signed-off-by: Silke Hofstra <silke@slxh.eu> 
							
						 
						
							2017-12-17 13:10:31 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								68ca864141 
								
							
								 
							
						 
						
							
							
								
								Add config option to disable media_repo on main synapse  
							
							 
							
							... 
							
							
							
							... to stop us doing the cache cleanup jobs on the master. 
							
						 
						
							2017-11-22 16:20:27 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e1fd4751de 
								
							
								 
							
						 
						
							
							
								
								Build MediaRepositoryResource as a homeserver dependency  
							
							 
							
							... 
							
							
							
							This avoids the scenario where we have four different PreviewUrlResources
configured on a single app, each of which have their own caches and cache
clearing jobs. 
							
						 
						
							2017-11-22 16:19:49 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								d4553818a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2627  from matrix-org/rav/custom_rest_endpoints  
							
							 
							
							... 
							
							
							
							Add a hook for custom rest endpoints 
							
						 
						
							2017-11-02 15:18:37 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fcdfc911ee 
								
							
								 
							
						 
						
							
							
								
								Add a hook for custom rest endpoints  
							
							 
							
							... 
							
							
							
							Let the user specify custom modules which can be used for implementing extra
endpoints. 
							
						 
						
							2017-11-02 14:36:55 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6650a07ede 
								
							
								 
							
						 
						
							
							
								
								Factor out _configure_named_resource  
							
							 
							
							... 
							
							
							
							This was a bit of a code vomit, so let's factor it out to preserve some sanity 
							
						 
						
							2017-11-02 14:33:37 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3fed5bb25f 
								
							
								 
							
						 
						
							
							
								
								Move quit_with_error  
							
							 
							
							
							
						 
						
							2017-10-02 17:59:34 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								10d8b701a1 
								
							
								 
							
						 
						
							
							
								
								Allow configuration of CPU affinity  
							
							 
							
							... 
							
							
							
							Make it possible to set the CPU affinity in the config file, so that we don't
need to remember to do it manually every time. 
							
						 
						
							2017-08-15 17:08:28 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								543c794a76 
								
							
								 
							
						 
						
							
							
								
								Factor out common application start  
							
							 
							
							... 
							
							
							
							We have 10 copies of this code, and I don't really want to update each one
separately. 
							
						 
						
							2017-08-15 17:04:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5ddd199870 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							 
							
							
							
						 
						
							2017-06-15 10:49:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4b461a6931 
								
							
								 
							
						 
						
							
							
								
								Add some more stats  
							
							 
							
							
							
						 
						
							2017-06-15 09:39:39 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								617304b2cf 
								
							
								 
							
						 
						
							
							
								
								Fix phone home stats  
							
							 
							
							
							
						 
						
							2017-06-14 19:47:15 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Wolff
							
						 
						
							 
							
							
								
								
							
							
								
							
								d4040e9e28 
								
									
								
							
								 
							
						 
						
							
							
								
								Queried CONDITIONAL_REQUIREMENTS  
							
							 
							
							
							
						 
						
							2017-04-18 16:19:48 -05:00  
						
					 
				
					
						
							
							
								 
								Matthew Wolff
							
						 
						
							 
							
							
								
								
							
							
								
							
								54f9a4cb59 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed travis build failure  
							
							 
							
							... 
							
							
							
							Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com> 
							
						 
						
							2017-04-17 01:38:27 -05:00  
						
					 
				
					
						
							
							
								 
								Matthew Wolff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8e780b113d 
								
									
								
							
								 
							
						 
						
							
							
								
								web_server_root documentation fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com> 
							
						 
						
							2017-04-17 00:49:11 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								28a4649785 
								
							
								 
							
						 
						
							
							
								
								Remove HTTP replication APIs  
							
							 
							
							
							
						 
						
							2017-04-11 09:52:11 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3ba2859e0c 
								
							
								 
							
						 
						
							
							
								
								Add tcp replication listener type and hook it up  
							
							 
							
							
							
						 
						
							2017-03-30 13:31:10 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								067b00d49d 
								
							
								 
							
						 
						
							
							
								
								Run the reactor with the sentinel logcontext  
							
							 
							
							... 
							
							
							
							This fixes a class of 'Unexpected logcontext' messages, which were happening
because the logcontext was somewhat arbitrarily swapping between the sentinel
and the `run` logcontext. 
							
						 
						
							2017-03-18 00:07:43 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d84bd51e95 
								
							
								 
							
						 
						
							
							
								
								Refactor logger config for workers  
							
							 
							
							... 
							
							
							
							- to make it easier to add more config options. 
							
						 
						
							2017-03-10 15:34:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								edd6cdfc9a 
								
							
								 
							
						 
						
							
							
								
								Restore default bind address  
							
							 
							
							
							
						 
						
							2017-01-10 17:21:41 +00:00  
						
					 
				
					
						
							
							
								 
								Johannes Löthberg
							
						 
						
							 
							
							
							
								
							
								702c020e58 
								
							
								 
							
						 
						
							
							
								
								Fix check for bind_address  
							
							 
							
							... 
							
							
							
							The empty string is a valid setting for the bind_address option, so
explicitly check for None here instead.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-20 01:37:50 +01:00  
						
					 
				
					
						
							
							
								 
								Johannes Löthberg
							
						 
						
							 
							
							
							
								
							
								7dfd70fc83 
								
							
								 
							
						 
						
							
							
								
								Add support for specifying multiple bind addresses  
							
							 
							
							... 
							
							
							
							Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-18 21:51:56 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								689f4cb914 
								
							
								 
							
						 
						
							
							
								
								Update comment  
							
							 
							
							
							
						 
						
							2016-08-22 16:17:31 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c8f9b45bc2 
								
							
								 
							
						 
						
							
							
								
								Add usage stats to prometheus monitoring  
							
							 
							
							
							
						 
						
							2016-08-22 15:34:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24f36469bc 
								
							
								 
							
						 
						
							
							
								
								Add federation /version API  
							
							 
							
							
							
						 
						
							2016-08-05 16:36:07 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								66868119dc 
								
							
								 
							
						 
						
							
							
								
								Add metrics for psutil derived memory usage  
							
							 
							
							
							
						 
						
							2016-07-20 16:00:21 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								13e334506c 
								
							
								 
							
						 
						
							
							
								
								Remove the legacy v0 content upload API.  
							
							 
							
							... 
							
							
							
							The existing content can still be downloaded. The last upload to the
matrix.org server was in January 2015, so it is probably safe to remove
the upload API. 
							
						 
						
							2016-06-21 11:47:39 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7dbb473339 
								
							
								 
							
						 
						
							
							
								
								Add function to load config without generating it  
							
							 
							
							... 
							
							
							
							Renames ``load_config`` to ``load_or_generate_config``
Adds a method called ``load_config`` that just loads the
config.
The main synapse.app.homeserver will continue to use
``load_or_generate_config`` to retain backwards compat.
However new worker processes can use ``load_config`` to
load the config avoiding some of the cruft needed to generate
the config.
As the new ``load_config`` method is expected to be used by new
configs it removes support for the legacy commandline overrides
that ``load_or_generate_config`` supports 
							
						 
						
							2016-06-09 18:50:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dded389ac1 
								
							
								 
							
						 
						
							
							
								
								Allow setting of gc.set_thresholds  
							
							 
							
							
							
						 
						
							2016-06-07 15:45:56 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f22f46f4f9 
								
							
								 
							
						 
						
							
							
								
								Move the listenTCP call outside the manhole function  
							
							 
							
							
							
						 
						
							2016-04-25 14:59:21 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5905f36f05 
								
							
								 
							
						 
						
							
							
								
								Split out setting up the manhole to a separate file  
							
							 
							
							
							
						 
						
							2016-04-22 17:09:15 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								62607d5452 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/split_out_site.py  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/app/homeserver.py 
							
						 
						
							2016-04-22 16:26:57 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e856036f4c 
								
							
								 
							
						 
						
							
							
								
								Move SynapseSite to its own file  
							
							 
							
							
							
						 
						
							2016-04-22 16:09:55 +01:00