Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							eddce9d74a 
							
						 
					 
					
						
						
							
							Merge pull request  #2027  from matrix-org/rav/logcontext_leaks  
						
						... 
						
						
						
						A few fixes to logcontext things 
						
						
					 
					
						2017-03-20 11:53:36 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							2e05f5d7a4 
							
						 
					 
					
						
						
							
							Merge pull request  #2025  from matrix-org/rav/no_reset_state_on_rejections  
						
						... 
						
						
						
						Avoid resetting state on rejected events 
						
						
					 
					
						2017-03-20 11:21:01 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							d78d08981a 
							
						 
					 
					
						
						
							
							log_contexts.rst: fix typos  
						
						
						
						
					 
					
						2017-03-18 22:47:37 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							7b53e9ebfd 
							
						 
					 
					
						
						
							
							Merge pull request  #2028  from majewsky/readme-fix-1  
						
						... 
						
						
						
						README.md: fix link to client list on matrix.org/docs 
						
						
					 
					
						2017-03-18 17:03:03 +00:00 
						 
				 
			
				
					
						
							
							
								Stefan Majewsky 
							
						 
					 
					
						
						
						
						
							
						
						
							be20243549 
							
						 
					 
					
						
						
							
							README.md: fix link to client list on matrix.org/docs  
						
						
						
						
					 
					
						2017-03-18 17:16:12 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f40c2db05a 
							
						 
					 
					
						
						
							
							Stop preserve_fn leaking context into the reactor  
						
						... 
						
						
						
						Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the
reactor, and add a test for it.
Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do
the same thing but had its own, different, set of bugs. 
						
						
					 
					
						2017-03-18 00:07:43 +00: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 
							
						 
					 
					
						
						
						
						
							
						
						
							994d7ae7c5 
							
						 
					 
					
						
						
							
							Remove broken use of clock.call_later  
						
						... 
						
						
						
						background_updates was using `call_later` in a way that leaked the logcontext
into the reactor.
We could have rewritten it to do it properly, but given that we weren't using
the fancier facilities provided by `call_later`, we might as well just use
`async.sleep`, which does the logcontext stuff properly. 
						
						
					 
					
						2017-03-18 00:01:37 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							d2d146a314 
							
						 
					 
					
						
						
							
							Logcontext docs  
						
						
						
						
					 
					
						2017-03-17 23:59:28 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							61f471f779 
							
						 
					 
					
						
						
							
							Don't send the full event json over replication  
						
						
						
						
					 
					
						2017-03-17 15:50:01 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							0c01f829ae 
							
						 
					 
					
						
						
							
							Avoid resetting state on rejected events  
						
						... 
						
						
						
						When we get a rejected event, give it the same state_group as its prev_event,
rather than no state_group at all.
This should fix https://github.com/matrix-org/synapse/issues/1935 . 
						
						
					 
					
						2017-03-17 15:06:08 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							5068fb16a5 
							
						 
					 
					
						
						
							
							Refactoring and cleanups  
						
						... 
						
						
						
						A few non-functional changes:
* A bunch of docstrings to document types
* Split `EventsStore._persist_events_txn` up a bit. Hopefully it's a bit more
  readable.
* Rephrase `EventFederationStore._update_min_depth_for_room_txn` to avoid
  mind-bending conditional.
* Rephrase rejected/outlier conditional in `_update_outliers_txn` to avoid
  mind-bending conditional. 
						
						
					 
					
						2017-03-17 15:06:07 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							2abe85d50e 
							
						 
					 
					
						
						
							
							Merge pull request  #2016  from matrix-org/rav/queue_pdus_during_join  
						
						... 
						
						
						
						Queue up federation PDUs while a room join is in progress 
						
						
					 
					
						2017-03-17 11:32:44 +00:00 
						 
				 
			
				
					
						
							
							
								John Kristensen 
							
						 
					 
					
						
						
						
						
							
						
						
							be44558886 
							
						 
					 
					
						
						
							
							Don't assume postgres tables are in the public schema during db port  
						
						... 
						
						
						
						When fetching the list of tables from the postgres database during the
db port, it is assumed that the tables are in the public schema. This is
not always the case, so lets just rely on postgres to determine the
default schema to use. 
						
						
					 
					
						2017-03-17 10:53:32 +11:00 
						 
				 
			
				
					
						
							
							
								Keyvan Fatehi 
							
						 
					 
					
						
						
						
						
							
						
						
							9adf1991ca 
							
						 
					 
					
						
						
							
							Update README: specify python2.7 in virtualenv  
						
						... 
						
						
						
						Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com> 
						
						
					 
					
						2017-03-16 16:37:14 -07:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							248eb4638d 
							
						 
					 
					
						
						
							
							Merge pull request  #2022  from matrix-org/erikj/no_op_sync  
						
						... 
						
						
						
						Implement no op for room stream in sync 
						
						
					 
					
						2017-03-16 13:05:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							da146657c9 
							
						 
					 
					
						
						
							
							Comments  
						
						
						
						
					 
					
						2017-03-16 13:04:07 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a158c36a8a 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-03-16 11:57:45 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6957bfdca6 
							
						 
					 
					
						
						
							
							Don't recreate so many sets  
						
						
						
						
					 
					
						2017-03-16 11:54:26 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2ccf3b241c 
							
						 
					 
					
						
						
							
							Implement no op for room stream in sync  
						
						
						
						
					 
					
						2017-03-16 11:06:41 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							9ce53a3861 
							
						 
					 
					
						
						
							
							Queue up federation PDUs while a room join is in progress  
						
						... 
						
						
						
						This just takes the existing `room_queues` logic and moves it out to
`on_receive_pdu` instead of `_process_received_pdu`, which ensures that we
don't start trying to fetch prev_events and whathaveyou until the join has
completed. 
						
						
					 
					
						2017-03-15 18:01:11 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							54d2b7e596 
							
						 
					 
					
						
						
							
							Merge pull request  #2014  from Half-Shot/hs/fix-appservice-presence  
						
						... 
						
						
						
						Add fallback to last_active_ts if it beats the last sync time on a presence timeout. 
						
						
					 
					
						2017-03-15 17:37:15 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							9d527191bc 
							
						 
					 
					
						
						
							
							Merge pull request  #2013  from matrix-org/erikj/presence_FASTER  
						
						... 
						
						
						
						Format presence events on the edges instead of reformatting them multiple times 
						
						
					 
					
						2017-03-15 16:01:29 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a8f96c63aa 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-03-15 16:01:01 +00:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							c144292373 
							
						 
					 
					
						
						
							
							Modify test_user_sync so it doesn't look at last_active_ts over last_user_sync_ts  
						
						
						
						
					 
					
						2017-03-15 15:38:57 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f83ac78201 
							
						 
					 
					
						
						
							
							Cache set of users whose presence the other user should see  
						
						
						
						
					 
					
						2017-03-15 15:29:19 +00:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							e6032054bf 
							
						 
					 
					
						
						
							
							Add a great comment to handle_timeout for active vs sync times.  
						
						
						
						
					 
					
						2017-03-15 15:24:48 +00:00 
						 
				 
			
				
					
						
							
							
								Will Hunt 
							
						 
					 
					
						
						
						
						
							
						
						
							ebf5a6b14c 
							
						 
					 
					
						
						
							
							Add fallback to last_active_ts if it beats the last sync time.  
						
						
						
						
					 
					
						2017-03-15 15:17:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e892457a03 
							
						 
					 
					
						
						
							
							Comment  
						
						
						
						
					 
					
						2017-03-15 15:01:39 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a297155a97 
							
						 
					 
					
						
						
							
							Remove unused import  
						
						
						
						
					 
					
						2017-03-15 14:49:25 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6c82de5100 
							
						 
					 
					
						
						
							
							Format presence events on the edges instead of reformatting them multiple times  
						
						
						
						
					 
					
						2017-03-15 14:27:34 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad44acb5a 
							
						 
					 
					
						
						
							
							Merge pull request  #1997  from matrix-org/dbkr/cas_partialdownload  
						
						... 
						
						
						
						Handle PartialDownloadError in CAS login 
						
						
					 
					
						2017-03-15 13:52:34 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							5f14e7e982 
							
						 
					 
					
						
						
							
							Merge pull request  #2010  from matrix-org/rav/fix_txnq_wedge  
						
						... 
						
						
						
						Fix assertion to stop transaction queue getting wedged 
						
						
					 
					
						2017-03-15 13:07:50 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							0970e0307e 
							
						 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2017-03-15 12:40:42 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa42d4292 
							
						 
					 
					
						
						
							
							set default for turn_allow_guests correctly  
						
						
						
						
					 
					
						2017-03-15 12:40:13 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ff66251f 
							
						 
					 
					
						
						
							
							add setting (on by default) to support TURN for guests  
						
						
						
						
					 
					
						2017-03-15 12:22:18 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							29ed09e80a 
							
						 
					 
					
						
						
							
							Fix assertion to stop transaction queue getting wedged  
						
						... 
						
						
						
						... and update some docstrings to correctly reflect the types being used.
get_new_device_msgs_for_remote can return a long under some circumstances,
which was being stored in last_device_list_stream_id_by_dest, and was then
upsetting things on the next loop. 
						
						
					 
					
						2017-03-15 12:16:55 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3b2dd1b3c2 
							
						 
					 
					
						
						
							
							Merge pull request  #2008  from matrix-org/erikj/notifier_stats  
						
						... 
						
						
						
						Add some metrics on notifier 
						
						
					 
					
						2017-03-15 11:25:02 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							872e75a3d5 
							
						 
					 
					
						
						
							
							Add some metrics on notifier  
						
						
						
						
					 
					
						2017-03-15 10:56:51 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7827251daf 
							
						 
					 
					
						
						
							
							Merge pull request  #1994  from matrix-org/dbkr/msisdn_signin_2  
						
						... 
						
						
						
						Phone number registration / login support v2 
						
						
					 
					
						2017-03-15 09:59:54 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d1c68beb 
							
						 
					 
					
						
						
							
							Implement reset_context_after_deferred  
						
						... 
						
						
						
						to correctly reset the context when we fire off a deferred we aren't going to
wait for. 
						
						
					 
					
						2017-03-15 02:21:07 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f2ed64eaaf 
							
						 
					 
					
						
						
							
							Merge pull request  #1992  from matrix-org/rav/fix_media_loop  
						
						... 
						
						
						
						Fix routing loop when fetching remote media 
						
						
					 
					
						2017-03-14 23:40:35 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							ef328b2fc1 
							
						 
					 
					
						
						
							
							kick jenkins  
						
						
						
						
					 
					
						2017-03-14 20:44:50 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bad72b0b8e 
							
						 
					 
					
						
						
							
							Merge pull request  #2002  from matrix-org/erikj/dont_sync_by_default  
						
						... 
						
						
						
						Reduce number of spurious sync result generations. 
						
						
					 
					
						2017-03-14 16:58:45 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf84c4b6b 
							
						 
					 
					
						
						
							
							Merge pull request  #1989  from matrix-org/erikj/public_list_speed  
						
						... 
						
						
						
						Speed up public room list 
						
						
					 
					
						2017-03-14 16:58:26 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fd2eef49c8 
							
						 
					 
					
						
						
							
							Reduce spurious calls to generate sync  
						
						
						
						
					 
					
						2017-03-14 16:33:45 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							1d09586599 
							
						 
					 
					
						
						
							
							Address review comments  
						
						... 
						
						
						
						- don't blindly proxy all HTTPRequestExceptions
- log unexpected exceptions at error
- avoid `isinstance`
- improve docs on `from_http_response_exception` 
						
						
					 
					
						2017-03-14 14:15:37 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							7f237800e9 
							
						 
					 
					
						
						
							
							re-refactor exception heirarchy  
						
						... 
						
						
						
						Give CodeMessageException back its `msg` attribute, and use that to hold the
HTTP status message for HttpResponseException. 
						
						
					 
					
						2017-03-14 14:15:37 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							1ece06273e 
							
						 
					 
					
						
						
							
							Handle PartialDownloadError in CAS login  
						
						
						
						
					 
					
						2017-03-14 13:37:36 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							bb256ac96f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed  
						
						
						
						
					 
					
						2017-03-14 11:35:05 +00:00