summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* no need to join room if creatorNeil Johnson2018-10-131-1/+2
|
* improve auto room join logic, comments and testsNeil Johnson2018-10-124-9/+36
|
* Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-0489-756/+721
|\
| * Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-042-33/+70
| |\ | | | | | | Fix bug in forward_extremity update logic
| | * actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| | |
| | * fix newsfile nameRichard van der Hoff2018-10-031-0/+0
| | |
| | * remove debuggingRichard van der Hoff2018-10-021-10/+0
| | |
| | * Fix bug in forward_extremity update logicRichard van der Hoff2018-10-022-33/+79
| | | | | | | | | | | | | | | An event does not stop being a forward_extremity just because an outlier or rejected event refers to it.
| * | Merge branch 'master' into developAmber Brown2018-10-0463-66/+88
| |\ \
| | * | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6Amber Brown2018-10-042-1/+9
| | | |
| | * | full versionAmber Brown2018-10-041-1/+1
| | | |
| | * | Merge pull request #4002 from matrix-org/rav/pin_prometheusRichard van der Hoff2018-10-032-1/+5
| | |\ \ | | | | | | | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics
| | | * | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-032-1/+5
| | |/ /
| | * | Merge pull request #3998 from ↵Richard van der Hoff2018-10-031-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/build_docker_images_of_rc_tags Docker build all tags starting vX.Y.Z, including release candidates
| | | * | Docker build all tags starting vX.Y.Z, inc RCsMichael Kaye2018-10-031-1/+1
| | |/ / | | | | | | | | | | | | | | | | Note the regex must match the complete string anyway, so the leading ^ was useless.
| | * | some changelog fixesAmber Brown2018-10-031-8/+4
| | | |
| | * | changelog v0.33.6rc1Amber Brown2018-10-0360-61/+75
| | | |
| | * | versionAmber Brown2018-10-031-1/+1
| | |/
| * | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-032-5/+3
| |\ \ | | | | | | | | Fix handling of rejected threepid invites
| | * | Sanitise error messages when user doesn't have permission to inviteErik Johnston2018-10-031-5/+2
| | | |
| | * | NewsfileErik Johnston2018-10-031-0/+1
| | | |
| | * | Fix handling of rejected threepid invitesErik Johnston2018-10-031-1/+1
| | |/
| * | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-032-2/+7
| |\ \ | | | | | | | | Fix exception in background metrics collection
| | * | NewsfileErik Johnston2018-10-031-0/+1
| | | |
| | * | Fix exception in background metrics collectionErik Johnston2018-10-031-2/+6
| | |/ | | | | | | | | | | | | We attempted to iterate through a list on a separate thread without doing the necessary copying.
| * | Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handlingErik Johnston2018-10-032-6/+3
| |\ \ | | |/ | |/| Fix exception handling in fetching remote profiles
| | * NewsfileErik Johnston2018-10-031-0/+1
| | |
| | * Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
| |/
| * Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cacheErik Johnston2018-10-023-1/+47
| |\ | | | | | | Fix bug when invalidating destination retry timings
| | * Add testsErik Johnston2018-10-021-0/+45
| | |
| | * NewsfileErik Johnston2018-10-021-0/+1
| | |
| | * Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
| | |
| * | Remove Jenkins & other old dev junk (#3988)Amber Brown2018-10-0312-278/+4
| |/
| * Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-022-2/+3
| |\ | | | | | | Fix error handling for missing auth_event
| | * Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0168-442/+779
| | |\
| | * | changelogRichard van der Hoff2018-09-261-0/+1
| | | |
| | * | Fix error handling for missing auth_eventRichard van der Hoff2018-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we were authorizing an event, if there was no `m.room.create` in its auth_events, we would raise a SynapseError with a cryptic message, which then meant that we would bail out of processing any incoming events, rather than storing a rejection for the faulty event and moving on. We should treat the absent event the same as any other auth failure, by raising an AuthError, so that the event is marked as rejected.
| * | | Disable frozen dicts by default (#3987)Amber Brown2018-10-024-5/+18
| | | |
| * | | Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connectionErik Johnston2018-10-022-6/+22
| |\ \ \ | | | | | | | | | | Fix error when logging incomplete requests
| | * | | NewsfileErik Johnston2018-10-021-0/+1
| | | | |
| | * | | Fix error when logging incomplete requestsErik Johnston2018-10-021-6/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a connection is lost before a request is read from Request, Twisted sets `method` (and `uri`) attributes to dummy values. These dummy values have incorrect types (i.e. they're not bytes), and so things like `__repr__` would raise an exception. To fix this we had a helper method to return the method with a consistent type.
| * | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-023-22/+24
| |\ \ \ | | | | | | | | | | Avoid reraise, to improve stacktraces
| | * | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-013-22/+24
| | | |/ | | |/|
| * | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-022-2/+3
| |\ \ \ | | |/ / | |/| | Fix lazy loaded sync with rejected state events
| | * | NewsfileErik Johnston2018-10-011-0/+1
| | | |
| | * | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, we assume that the name and canonical alias events in the state have not been rejected. In practice this may not be the case (though we should probably think about fixing that) so lets ensure that we gracefully handle that case, rather than 404'ing the sync request like we do now.
| * | | Update instructions to point to pip install (#3985)Amber Brown2018-10-024-61/+29
| | | |
| * | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-013-118/+47
| |\ \ \ | | | | | | | | | | Fix exceptions when handling incoming transactions
| | * \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-2731-38/+117
| | |\ \ \
| | * | | | Remove redundant, failing, testRichard van der Hoff2018-09-271-106/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test didn't do what it claimed to do, and what it claimed to do was the same as test_cant_hide_direct_ancestors anyway. This stuff is tested by sytest anyway.
| | * | | | changelogRichard van der Hoff2018-09-271-0/+1
| | | | | |
| | * | | | Include event when resolving state for missing prevsRichard van der Hoff2018-09-271-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a forward extremity for a room as `E`, and you receive `A`, `B`, s.t. `A -> B -> E`, and `B` also points to an unknown event `X`, then we need to do state res between `X` and `E`. When that happens, we need to make sure we include `X` in the state that goes into the state res alg. Fixes #3934.
| | * | | | Include state from remote servers in pdu handlingRichard van der Hoff2018-09-271-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we've fetched state events from remote servers in order to resolve the state for a new event, we need to actually pass those events into resolve_events_with_factory (so that it can do the state res) and then persist the ones we need - otherwise other bits of the codebase get confused about why we have state groups pointing to non-existent events.
| | * | | | Fix "unhashable type: 'list'" exception in federation handlingRichard van der Hoff2018-09-271-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_state_groups returns a map from state_group_id to a list of FrozenEvents, so was very much the wrong thing to be putting as one of the entries in the list passed to resolve_events_with_factory (which expects maps from (event_type, state_key) to event id). We actually want get_state_groups_ids().values() rather than get_state_groups(). This fixes the main problem in #3923, but there are other problems with this bit of code which get discovered once you do so.
| * | | | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-026-96/+240
| | |_|/ / | |/| | |
| * | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-013-3/+45
| |\ \ \ \ | | | | | | | | | | | | Add a five minute cache to get_destination_retry_timings
| | * | | | Correctly match 'dict.pop' apiErik Johnston2018-10-011-3/+11
| | | | | |
| | * | | | Don't update eviction metrics on explicit removalErik Johnston2018-10-011-5/+0
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2851-426/+696
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-266-187/+440
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2551-62/+128
| | |\ \ \ \ \
| | * | | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-211-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to try and produce an estimate, which was sometimes negative. This caused metrics to be sad, so lets always just calculate it from scratch.
| | * | | | | | NewsfileErik Johnston2018-09-211-0/+1
| | | | | | | |
| | * | | | | | Add a five minute cache to get_destination_retry_timingsErik Johnston2018-09-212-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully helps with #3931
| | * | | | | | Make ExpiringCache slightly more performantErik Johnston2018-09-211-1/+5
| | | | | | | |
| * | | | | | | Further reduce the size of the docker image (#3972)Richard van der Hoff2018-10-012-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need.
| * | | | | | | add --no-admin flag to registration script (#3836)Bruno Windels2018-09-282-4/+15
| | | | | | | |
| * | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-283-30/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove spurious federation checks on localhost
| | * | | | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-282-1/+3
| | | | | | | | |
| | * | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | | | | | | | |
| | * | | | | | | remove spurious federation checks on localhostRichard van der Hoff2018-09-261-31/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's really no point in checking for destinations called "localhost" because there is nothing stopping people creating other DNS entries which point to 127.0.0.1. The right fix for this is https://github.com/matrix-org/synapse/issues/3953. Blocking localhost, on the other hand, means that you get a surprise when trying to connect a test server on localhost to an existing server (with a 'normal' server_name).
| * | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_callRichard van der Hoff2018-09-282-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove redundant call to start_get_pdu_cache
| | * | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-282-1/+1
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this got forgotten in #3932. We were getting away with it because it was the last call in this function.
| * / | | | | | | build python 3 docker images on circle CI (#3976)Jan Christian Grünhage2018-09-282-5/+12
| |/ / / / / / /
* | | | | | | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-043-46/+62
| | | | | | | |
* | | | | | | | changelogMatthew Hodgson2018-09-291-0/+1
| | | | | | | |
* | | | | | | | emit room aliases eventMatthew Hodgson2018-09-291-3/+8
| | | | | | | |
* | | | | | | | fix thinkosMatthew Hodgson2018-09-292-7/+7
| | | | | | | |
* | | | | | | | fix UTsMatthew Hodgson2018-09-282-5/+10
| | | | | | | |
* | | | | | | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-282-0/+22
|/ / / / / / /
* | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-272-3/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve performance of getting typing updates for replication
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-19177-1345/+2545
| |\ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2018-09-191-0/+1
| | | | | | | | |
| * | | | | | | | Improve performance of getting typing updates for replicationErik Johnston2018-09-051-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetching the list of all new typing notifications involved iterating over all rooms and comparing their serial. Lets move to using a stream change cache, like we do for other streams.
* | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_uploadRichard van der Hoff2018-09-272-0/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Build and push docker image to hub automatically
| * | | | | | | | | Do the changelog.d danceMichael Kaye2018-09-271-0/+1
| | | | | | | | | |
| * | | | | | | | | Make a ":latest" tag, and a SHA1 commit ID one too.Michael Kaye2018-09-271-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest is horrible and makes debugging what has happened anywhere a nightmare. We push a latest because of demand for it, but we'll also push a SHA1 commit id so those wanting to know what they're running (and be able to roll back if required) can use those instead. Note that latest here is defined as "most recent master commit" not "most recent released version", as the actual semantics of making latest correct while still being able to build bugfixed releases of previous versions is just ARGH. So we define it as "master" not "latest release".
| * | | | | | | | | Also, don't run this job on any branchesMichael Kaye2018-09-271-1/+3
| | | | | | | | | |
| * | | | | | | | | Make username configurable in the UI tooMichael Kaye2018-09-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix typoMichael Kaye2018-09-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Build and push docker image to hubMichael Kaye2018-09-271-0/+11
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-273-4/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | Clarifications in FederationHandler
| * | | | | | | | | more commentsRichard van der Hoff2018-09-272-6/+3
| | | | | | | | | |
| * | | | | | | | | changelogRichard van der Hoff2018-09-271-0/+1
| | | | | | | | | |
| * | | | | | | | | Clarifications in FederationHandlerRichard van der Hoff2018-09-271-2/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add some comments on things that look a bit bogus * rename this `state` variable to avoid confusion with the `state` used elsewhere in this function. (There was no actual conflict, but it was a confusing bit of spaghetti.)
* | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_processAmber Brown2018-09-272-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Run notify_app_services as a bg process
| * | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | | | | | | | | |
| * | | | | | | | | Run notify_app_services as a bg processRichard van der Hoff2018-09-261-2/+6
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that its resource usage metrics get recorded somewhere rather than getting lost. (It also fixes an error when called from a nested logging context which completes before the bg process)
* | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-2719-19/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Replaced all occurences of e.message with str(e)
| * | | | | | | | | Update 3970.bugfixAmber Brown2018-09-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Added changelog fragmentSchnuffle2018-09-271-0/+1
| | | | | | | | | |
| * | | | | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-2718-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com>
* | | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-274-13/+38
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-272-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | fix #3854 MAU transaction errors
| * | | | | | | | | towncrierNeil Johnson2018-09-261-0/+1
| | | | | | | | | |
| * | | | | | | | | fix #3854Neil Johnson2018-09-261-1/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-273-2/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Logging improvements
| * | | | | | | | | Logging improvementsRichard van der Hoff2018-09-263-2/+17
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Some logging tweaks to help with debugging incoming federation transactions
* | | | | | | | | Include eventid in log lines when processing incoming federation ↵Richard van der Hoff2018-09-276-57/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines.
* | | | | | | | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-273-8/+62
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | I spent ages trying to figure out how I was going mad...
* | | | | | | | Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstringAmber Brown2018-09-272-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | fix docstring for FederationClient.get_state_for_room
| * | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | | | | | | |
| * | | | | | | fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | trivial fixes for docstring
* / / / / / / Reduce the load on our CI (#3957)Amber Brown2018-09-273-8/+30
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changelog * reduce circleci config * plus a handy script * fix regex
* | | | | | Merge branch 'develop' into rav/hacky_cache_factor_fixRichard van der Hoff2018-09-266-315/+320
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-263-20/+25
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | Fix ExpiringCache.__len__ to be accurate
| | * | | | | Log which cache is throwing exceptionsRichard van der Hoff2018-09-261-10/+17
| | | | | | |
| | * | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | | | | | |
| | * | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-261-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to try and produce an estimate, which was sometimes negative. This caused metrics to be sad, so lets always just calculate it from scratch. (This appears to have been a longstanding bug, but one which has been made more of a problem by #3932 and #3933). (This was originally done by Erik as part of #3933. I'm cherry-picking it because really it's a fix in its own right)
| * | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctlAmber Brown2018-09-263-285/+285
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Move synctl into top dir to avoid a symlink
| | * | | | | | changelogRichard van der Hoff2018-09-251-0/+1
| | | | | | | |
| | * | | | | | Move synctl into top dir to avoid a symlinkRichard van der Hoff2018-09-252-285/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symlinks apparently break setuptools on python3 and alpine (https://bugs.python.org/issue31940), so let's stop using a symlink and just use the file directly.
* | | | | | | | Actuall set cache factors in workersErik Johnston2018-09-261-5/+15
|/ / / / / / /
* | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-263-24/+48
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Comments and interface cleanup for on_receive_pdu
| * | | | | | changelogRichard van der Hoff2018-09-201-0/+1
| | | | | | |
| * | | | | | Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-202-24/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some informative comments about what's going on here. Also, `sent_to_us_directly` and `get_missing` were doing the same thing (apart from in `_handle_queued_pdus`, which looks like a bug), so let's get rid of `get_missing` and use `sent_to_us_directly` consistently.
* | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3Richard van der Hoff2018-09-253-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | make python 3 work in the docker container
| * | | | | | | Update DockerfileJan Christian Grünhage2018-09-251-1/+0
| | | | | | | |
| * | | | | | | Update .dockerignoreJan Christian Grünhage2018-09-251-1/+0
| | | | | | | |
| * | | | | | | add changelogJan Christian Grünhage2018-09-201-0/+1
| | | | | | | |
| * | | | | | | make python 3 work in the docker containerJan Christian Grünhage2018-09-203-2/+6
| | | | | | | |
* | | | | | | | Update grafana dashboardRichard van der Hoff2018-09-251-175/+417
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-2517-39/+13
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Fix some instances of ExpiringCache not expiring cache items
| * | | | | | NewsfileErik Johnston2018-09-211-0/+1
| | | | | | |
| * | | | | | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-2116-39/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead.
* | | | | | | added "media-src: 'self'" to CSP for resources (#3578)Jérémy Farnaud2018-09-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse doesn’t allow for media resources to be played directly from Chrome. It is a problem for users on other networks (e.g. IRC) communicating with Matrix users through a gateway. The gateway sends them the raw URL for the resource when a Matrix user uploads a video and the video cannot be played directly in Chrome using that URL. Chrome argues it is not authorized to play the video because of the Content Security Policy. Chrome checks for the "media-src" policy which is missing, and defauts to the "default-src" policy which is "none". As Synapse already sends "object-src: 'self'" I thought it wouldn’t be a problem to add "media-src: 'self'" to the CSP to fix this problem.
* | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregisteredRichard van der Hoff2018-09-252-14/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix spurious exceptions when client closes conncetion
| * | | | | | | NewsfileErik Johnston2018-09-201-0/+1
| | | | | | | |
| * | | | | | | Fix spurious exceptions when client closes conncetionErik Johnston2018-09-201-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a HTTP handler throws an exception while processing a request we automatically write a JSON error response. If the handler had already started writing a response twisted throws an exception. We should check for this case and simple abort the connection if there was an error after the response had started being written.
* | | | | | | | Merge pull request #3947 from matrix-org/rav/attr_versionRichard van der Hoff2018-09-252-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | We require attrs 16.0.0
| * | | | | | | changelogRichard van der Hoff2018-09-251-0/+1
| | | | | | | |
| * | | | | | | We require attrs 16.0.0Richard van der Hoff2018-09-251-1/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Ref: https://github.com/matrix-org/synapse/issues/3945
* | | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-252-5/+9
| | | | | | | | | | | | | | | | | | | | | Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline.
* | | | | | | Merge branch 'master' into developAmber Brown2018-09-253-3/+13
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'v0.33.5.1'Amber Brown2018-09-253-3/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal Changes ---------------- - Fix incompatibility with older Twisted version in tests. Thanks @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940))
| | * | | | | | | changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1Amber Brown2018-09-252-2/+10
| | | | | | | | |
| | * | | | | | | bump versionAmber Brown2018-09-251-1/+1
| | | | | | | | |
| | * | | | | | | changelog for 3940Amber Brown2018-09-251-0/+2
| | | | | | | | |
| | * | | | | | | Fix compatibility issue with older Twisted in tests.Oleg Girko2018-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older Twisted (18.4.0) returns TimeoutError instead of ConnectingCancelledError when connection times out. This change allows tests to be compatible with this behaviour. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* | | | | | | | | Merge branch 'master' into developAmber Brown2018-09-2442-40/+65
|\| | | | | | | | | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge tag 'v0.33.5'Amber Brown2018-09-2487-1091/+1998
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features -------- - Python 3.5 and 3.6 support is now in beta. ([\#3576](https://github.com/matrix-org/synapse/issues/3576)) - Implement `event_format` filter param in `/sync` ([\#3790](https://github.com/matrix-org/synapse/issues/3790)) - Add synapse_admin_mau:registered_reserved_users metric to expose number of real reaserved users ([\#3846](https://github.com/matrix-org/synapse/issues/3846)) Bugfixes -------- - Remove connection ID for replication prometheus metrics, as it creates a large number of new series. ([\#3788](https://github.com/matrix-org/synapse/issues/3788)) - guest users should not be part of mau total ([\#3800](https://github.com/matrix-org/synapse/issues/3800)) - Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted. ([\#3804](https://github.com/matrix-org/synapse/issues/3804)) - Fix existing room tags not coming down sync when joining a room ([\#3810](https://github.com/matrix-org/synapse/issues/3810)) - Fix jwt import check ([\#3824](https://github.com/matrix-org/synapse/issues/3824)) - fix VOIP crashes under Python 3 (#3821) ([\#3835](https://github.com/matrix-org/synapse/issues/3835)) - Fix manhole so that it works with latest openssh clients ([\#3841](https://github.com/matrix-org/synapse/issues/3841)) - Fix outbound requests occasionally wedging, which can result in federation breaking between servers. ([\#3845](https://github.com/matrix-org/synapse/issues/3845)) - Show heroes if room name/canonical alias has been deleted ([\#3851](https://github.com/matrix-org/synapse/issues/3851)) - Fix handling of redacted events from federation ([\#3859](https://github.com/matrix-org/synapse/issues/3859)) - ([\#3874](https://github.com/matrix-org/synapse/issues/3874)) - Mitigate outbound federation randomly becoming wedged ([\#3875](https://github.com/matrix-org/synapse/issues/3875)) Internal Changes ---------------- - CircleCI tests now run on the potential merge of a PR. ([\#3704](https://github.com/matrix-org/synapse/issues/3704)) - http/ is now ported to Python 3. ([\#3771](https://github.com/matrix-org/synapse/issues/3771)) - Improve human readable error messages for threepid registration/account update ([\#3789](https://github.com/matrix-org/synapse/issues/3789)) - Make /sync slightly faster by avoiding needless copies ([\#3795](https://github.com/matrix-org/synapse/issues/3795)) - handlers/ is now ported to Python 3. ([\#3803](https://github.com/matrix-org/synapse/issues/3803)) - Limit the number of PDUs/EDUs per federation transaction ([\#3805](https://github.com/matrix-org/synapse/issues/3805)) - Only start postgres instance for postgres tests on Travis CI ([\#3806](https://github.com/matrix-org/synapse/issues/3806)) - tests/ is now ported to Python 3. ([\#3808](https://github.com/matrix-org/synapse/issues/3808)) - crypto/ is now ported to Python 3. ([\#3822](https://github.com/matrix-org/synapse/issues/3822)) - rest/ is now ported to Python 3. ([\#3823](https://github.com/matrix-org/synapse/issues/3823)) - add some logging for the keyring queue ([\#3826](https://github.com/matrix-org/synapse/issues/3826)) - speed up lazy loading by 2-3x ([\#3827](https://github.com/matrix-org/synapse/issues/3827)) - Improved Dockerfile to remove build requirements after building reducing the image size. ([\#3834](https://github.com/matrix-org/synapse/issues/3834)) - Disable lazy loading for incremental syncs for now ([\#3840](https://github.com/matrix-org/synapse/issues/3840)) - federation/ is now ported to Python 3. ([\#3847](https://github.com/matrix-org/synapse/issues/3847)) - Log when we retry outbound requests ([\#3853](https://github.com/matrix-org/synapse/issues/3853)) - Removed some excess logging messages. ([\#3855](https://github.com/matrix-org/synapse/issues/3855)) - Speed up purge history for rooms that have been previously purged ([\#3856](https://github.com/matrix-org/synapse/issues/3856)) - Refactor some HTTP timeout code. ([\#3857](https://github.com/matrix-org/synapse/issues/3857)) - Fix running merged builds on CircleCI ([\#3858](https://github.com/matrix-org/synapse/issues/3858)) - Fix typo in replication stream exception. ([\#3860](https://github.com/matrix-org/synapse/issues/3860)) - Add in flight real time metrics for Measure blocks ([\#3871](https://github.com/matrix-org/synapse/issues/3871)) - Disable buffering and automatic retrying in treq requests to prevent timeouts. ([\#3872](https://github.com/matrix-org/synapse/issues/3872)) - mention jemalloc in the README ([\#3877](https://github.com/matrix-org/synapse/issues/3877)) - Remove unmaintained "nuke-room-from-db.sh" script ([\#3888](https://github.com/matrix-org/synapse/issues/3888))
| | * | | | | | towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5Amber Brown2018-09-241-0/+6
| | | | | | | |
| | * | | | | | update versionAmber Brown2018-09-241-1/+1
| | | | | | | |
| | * | | | | | changelog v0.33.5rc1Amber Brown2018-09-1741-39/+58
| | | | | | | |
| | * | | | | | update python 3 changelogAmber Brown2018-09-171-1/+1
| | | | | | | |
| | * | | | | | versionAmber Brown2018-09-171-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-212-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Handle exceptions thrown by background tasks
| * | | | | | | | Add missing loggerErik Johnston2018-09-201-0/+4
| | | | | | | | |
| * | | | | | | | NewsfileErik Johnston2018-09-201-0/+1
| | | | | | | | |
| * | | | | | | | Handle exceptions thrown by background tasksErik Johnston2018-09-201-0/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #3921
* | | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916)Matthew Hodgson2018-09-202-0/+5
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Should fix https://github.com/vector-im/riot-web/issues/7209
* | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_linksNeil Johnson2018-09-202-1/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Neilj/fix room invite mail links
| * | | | | | Merge remote-tracking branch 'origin/develop' into ↵Richard van der Hoff2018-09-1831-98/+351
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_room_invite_mail_links
| * | | | | | | towncrierNeil Johnson2018-09-131-0/+1
| | | | | | | |
| * | | | | | | fix link for case that config.email_riot_base_url is setNeil Johnson2018-09-131-1/+1
| | | | | | | |
* | | | | | | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-209-58/+238
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-202-8/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove get_destination_retry_timings cache
| * | | | | | | Fix up changelog and remove spurious commentErik Johnston2018-09-192-3/+1
| | | | | | | |
| * | | | | | | pep8Erik Johnston2018-09-191-1/+0
| | | | | | | |
| * | | | | | | NewsfileErik Johnston2018-09-191-0/+1
| | | | | | | |
| * | | | | | | Remove get_destination_retry_timings cacheErik Johnston2018-09-191-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we rely on the master to invalidate this cache promptly. However, after having moved most federation endpoints off of master this no longer happens, causing outbound fedeariont to get blackholed. Fixes #3798
* | | | | | | | Add a way to run tests in PostgreSQL in Docker (#3699)Amber Brown2018-09-208-9/+79
| | | | | | | |
* | | | | | | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-204-5/+77
| | | | | | | |
* | | | | | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-193-56/+111
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions.
* | | | | | | Merge pull request #3910 from matrix-org/erikj/update_timeoutErik Johnston2018-09-195-87/+52
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Update to use new timeout function everywhere.
| * | | | | | FixupErik Johnston2018-09-192-4/+1
| | | | | | |
| * | | | | | Replace custom DeferredTimeoutError with defer.TimeoutErrorErik Johnston2018-09-192-12/+5
| | | | | | |
| * | | | | | Run canceller first to allow it to generate correct errorErik Johnston2018-09-191-2/+5
| | | | | | |
| * | | | | | NewsfileErik Johnston2018-09-191-0/+1
| | | | | | |
| * | | | | | Update to use new timeout function everywhere.Erik Johnston2018-09-194-72/+43
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing deferred timeout helper function (and the one into twisted) suffer from a bug when a deferred's canceller throws an exception, #3842. The new helper function doesn't suffer from this problem.
* | | | | | update changelog for #3909Richard van der Hoff2018-09-191-1/+1
| | | | | |
* | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-192-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix matrixfederationclient.py logging: Destination is a string
| * | | | | | ChangelogTravis Ralston2018-09-181-0/+1
| | | | | | |
| * | | | | | Destination is a stringTravis Ralston2018-09-181-4/+4
| | | | | | |
* | | | | | | Remove documentation referencing Cygwin (#3873)Amber Brown2018-09-193-31/+10
| | | | | | |
* | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-192-3/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set SNI to the server_name, not whatever was in the SRV record
| * | | | | | | changelogRichard van der Hoff2018-09-181-0/+1
| | | | | | | |
| * | | | | | | Set SNI to the server_name, not whatever was in the SRV recordRichard van der Hoff2018-09-181-3/+10
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes #3843
* | | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-192-1/+31
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Bump timeout on get_missing_events request
| * | | | | | changelogRichard van der Hoff2018-09-181-0/+1
| | | | | | |
| * | | | | | Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
| |/ / / / /
* | | | | | Use directory server for room joins (#3899)Richard van der Hoff2018-09-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we do a join, always try the server we used for the alias lookup first. Fixes #2418
* | | | | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-185-186/+359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-192-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add python_version phone home stat
| * | | | | Create 3894.featureWill Hunt2018-09-171-0/+1
| | | | | |
| * | | | | typoWill Hunt2018-09-171-1/+1
| | | | | |
| * | | | | make pip happy?Will Hunt2018-09-171-2/+4
| | | | | |
| * | | | | Use a string for versionsWill Hunt2018-09-171-1/+1
| | | | | |
| * | | | | Add python_version phone home statWill Hunt2018-09-171-0/+2
| | | | | |
* | | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-182-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | don't ratelimit autojoins
| * | | | | | changelogMatthew Hodgson2018-09-151-0/+1
| | | | | | |
| * | | | | | don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
| | | | | | |
* | | | | | | Merge pull request #3882 from SimmyD/max_upload_docker_varRichard van der Hoff2018-09-183-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add variable for changing the max upload size in Docker container
| * | | | | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.Simon Dwyer2018-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Dwyer <simon@thedwyers.co>
| * | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-1/+1
| | | | | | | |
| * | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-0/+1
| | | | | | | |
| * | | | | | | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M"Simon Dwyer2018-09-161-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-183-4/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Return a 404 when deleting unknown room alias
| * | | | | | | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| | | | | | | |
| * | | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | | | | |
| * | | | | | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-172-4/+16
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1675 Fixes https://github.com/matrix-org/synapse/issues/2782
* | | | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metricsRichard van der Hoff2018-09-183-12/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix more b'abcd' noise in metrics
| * | | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | | | | |
| * | | | | | | Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
| | | | | | | |
* | | | | | | | Merge pull request #3897 from aaronraimist/synaspse-typoRichard van der Hoff2018-09-182-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in README, synaspse -> synapse
| * | | | | | | | Add changelogAaron Raimist2018-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | | | | | Fix typo in README, synaspse -> synapseAaron Raimist2018-09-171-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | / / / / Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logsRichard van der Hoff2018-09-173-5/+9
|\| | | | | | | | |_|_|/ / / / |/| | | | | | Fix some b'abcd' noise in logs and metrics
| * | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | | | |
| * | | | | | Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Python 3 compatibility: make sure that we decode some byte sequences before we use them to create log lines and metrics labels.
* / / / / / README: run python_dependencies with -mRichard van der Hoff2018-09-171-1/+1
|/ / / / / | | | | | | | | | | ... to stop things which try to import `types` getting `synapse.types` instead
* | | | | Merge pull request #3888 from matrix-org/rav/nuke_nuke_roomsAmber Brown2018-09-172-57/+1
|\ \ \ \ \ | |/ / / / |/| | | | Remove nuke-room-from-db.sh script
| * | | | changelogRichard van der Hoff2018-09-171-0/+1
| | | | |
| * | | | Remove nuke-room-from-db.sh scriptRichard van der Hoff2018-09-171-57/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with this script is that it is largely untested, entirely unmaintained, and running it is likely to make your synapse blow up in exciting ways. For example, it leaves a bunch of tables with dead values in it, like event_to_state_groups. Having it here sends a message that it is a supported part of synapse, which is absolutely not the case.
* | | | missing changelogMatthew Hodgson2018-09-151-0/+1
| | | |
* | | | mention libjemalloc in readme (#3877)Vincent Breitmoser2018-09-151-0/+8
| | | |
* | | | Fix timeout functionErik Johnston2018-09-151-1/+2
| | | | | | | | | | | | | | | | | | | | Turns out deferred.cancel sometimes throws, so we do that last to ensure that we always do resolve the new deferred.
* | | | Merge pull request #3875 from matrix-org/erikj/extra_timeoutsErik Johnston2018-09-143-0/+63
|\ \ \ \ | | | | | | | | | | Add an awful secondary timeout to fix wedged requests
| * | | | NewsfileErik Johnston2018-09-141-0/+1
| | | | |
| * | | | Add an awful secondary timeout to fix wedged requestsErik Johnston2018-09-142-0/+62
|/ / / / | | | | | | | | | | | | This is an attempt to mitigate #3842 by adding yet-another-timeout
* | | | don't filter membership events based on history visibility (#3874)Matthew Hodgson2018-09-142-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-145-7/+13
|\ \ \ \ | | | | | | | | | | timeouts 2: electric boogaloo
| * | | | fixAmber Brown2018-09-151-3/+3
| | | | |
| * | | | changelogAmber Brown2018-09-151-0/+1
| | | | |
| * | | | fixAmber Brown2018-09-141-1/+4
| | | | |
| * | | | fixAmber Brown2018-09-141-1/+1
| | | | |
| * | | | redact betterAmber Brown2018-09-141-2/+2
| | | | |
| * | | | we do that higher upAmber Brown2018-09-141-0/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2Amber Brown2018-09-148-61/+55
| |\| | |
| * | | | buffer?Amber Brown2018-09-141-1/+2
| | | | |
* | | | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metricsErik Johnston2018-09-145-4/+217
|\ \ \ \ \ | | | | | | | | | | | | Add in flight real time metrics for Measure blocks
| * | | | | Remove spurious commentErik Johnston2018-09-141-2/+0
| | | | | |
| * | | | | Measure outbound requestsErik Johnston2018-09-141-3/+6
| | | | | |
| * | | | | NewsfileErik Johnston2018-09-141-0/+1
| | | | | |
| * | | | | TestsErik Johnston2018-09-141-0/+81
| | | | | |
| * | | | | Add in flight real time metrics for Measure blocksErik Johnston2018-09-142-1/+131
|/ / / / /
* | | | | Merge pull request #3860 from matrix-org/travis/typo-1Travis Ralston2018-09-132-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fix minor typo in exception
| * | | | Create 3860.miscTravis Ralston2018-09-131-0/+1
| | | | |
| * | | | Fix minor typo in exceptionTravis Ralston2018-09-131-1/+1
|/ / / /
* / / / merge (#3576)Amber Brown2018-09-148-61/+55
|/ / /