summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* hide_profile: false should mean not to hide the profile :/ github/matthew/red_list matthew/red_listMatthew Hodgson2018-12-123-4/+6
|
* fix sense of 'hide'Matthew Hodgson2018-11-041-1/+1
|
* pull in profile_handler correctlyMatthew Hodgson2018-11-041-0/+2
|
* add im.vector.hide_profile to user account_dataMatthew Hodgson2018-11-044-6/+14
|
* merge master into dinsic, again...Matthew Hodgson2018-11-03167-2810/+6911
|\
| * versionAmber Brown2018-11-011-1/+1
| |
| * version bumpAmber Brown2018-10-311-1/+1
| |
| * Fix search 500ing (#4122)Amber Brown2018-10-311-2/+6
| |
| * version bumpAmber Brown2018-10-291-1/+1
| |
| * Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-262-0/+215
| |
| * Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-259-420/+603
| | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit.
| * Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-255-15/+140
| |\ | | | | | | Add config option to control alias creation
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-10-2546-443/+1124
| | |\ | | | | | | | | | | | | erikj/alias_disallow_list
| | * | Use allow/denyErik Johnston2018-10-251-6/+6
| | | |
| | * | Use match rather than searchErik Johnston2018-10-241-2/+3
| | | |
| | * | Anchor returned regex to start and end of stringErik Johnston2018-10-191-2/+6
| | | |
| | * | Add config option to control alias creationErik Johnston2018-10-195-15/+135
| | | |
| * | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-254-31/+84
| |\ \ \ | | |_|/ | |/| | fix race condiftion in calling initialise_reserved_users
| | * | add new lineNeil Johnson2018-10-251-0/+1
| | | |
| | * | improve commentsNeil Johnson2018-10-251-6/+6
| | | |
| | * | fix style inconsistenciesNeil Johnson2018-10-242-15/+47
| | | |
| | * | commit transaction before closingNeil Johnson2018-10-241-0/+1
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-2431-368/+994
| | |\ \
| | * | | remove white spaceNeil Johnson2018-10-231-2/+1
| | | | |
| | * | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-233-25/+45
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-10-2583-676/+2779
| |\ \ \ \ | | | |/ / | | |/| | | | | | | matthew/autocreate_autojoin
| | * | | Merge remote-tracking branch 'origin/develop' into ↵Richard van der Hoff2018-10-2412-67/+665
| | |\ \ \ | | | | | | | | | | | | | | | | | | rav/fix_event_filter_validation
| | | * \ \ Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-246-6/+6
| | | |\ \ \ | | | | | | | | | | | | | | Fix a number of flake8 errors
| | | | * | | Fix a number of flake8 errorsRichard van der Hoff2018-10-246-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there.
| | | * | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-246-61/+659
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | Add v2 state resolution algorithm
| | | | * | | CommentErik Johnston2018-10-241-2/+5
| | | | | | |
| | | | * | | Rename resolve_events_with_factoryErik Johnston2018-10-244-11/+11
| | | | | | |
| | | | * | | Update event_auth table for rejected eventsErik Johnston2018-10-161-15/+21
| | | | | | |
| | | | * | | Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
| | | | | | |
| | | | * | | User event.sender rather than alias event.user_idErik Johnston2018-10-161-1/+1
| | | | | | |
| | | | * | | Add v2 state res algorithm.Erik Johnston2018-10-163-24/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We hook this up to the vdh test room version.
| | * | | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-1/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes.
| | * | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-247-141/+141
| | |\ \ \ \ | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers
| | | * | | | Fix start_pushers vs _start_pushers confusionRichard van der Hoff2018-10-241-3/+3
| | | | | | |
| | | * | | | sanity-check the is_processing flagRichard van der Hoff2018-10-242-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and rename it, for even more sanity
| | | * | | | Run PusherPool.start as a background processRichard van der Hoff2018-10-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't do anything with the result, so this is needed to give this code a logcontext.
| | | * | | | Make on_started synchronous tooRichard van der Hoff2018-10-223-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings it into line with on_new_notifications and on_new_receipts. It requires a little bit of hoop-jumping in EmailPusher to load the throttle params before the first loop.
| | | * | | | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-227-50/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough.
| | | * | | | Give pushers their own background logcontextRichard van der Hoff2018-10-222-58/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each pusher has its own loop which runs for as long as it has work to do. This should run in its own background thread with its own logcontext, as other similar loops elsewhere in the system do - which means that CPU usage is consistently attributed to that loop, rather than to whatever request happened to start the loop.
| | | * | | | move get_all_pushers call downRichard van der Hoff2018-10-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | simplifies the interface to _start_pushers
| | | * | | | Factor PusherPool._start_pusher out of _start_pushersRichard van der Hoff2018-10-221-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and use it from start_pusher_by_id. This mostly simplifies start_pusher_by_id.
| | | * | | | Rename _refresh_pusherRichard van der Hoff2018-10-222-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is public (or at least, called from outside the class), so ought to have a better name.
| | * | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-243-64/+55
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | Clean up room alias creation
| | | * | | | Clean up room alias creationErik Johnston2018-10-193-64/+55
| | | | | | |
| | * | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-232-8/+22
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups
| | | * | | | | Comments helpTravis Ralston2018-10-231-0/+5
| | | | | | | |
| | | * | | | | isortTravis Ralston2018-10-121-1/+1
| | | | | | | |
| | | * | | | | More sane handling of group errors and pep8Travis Ralston2018-10-121-4/+5
| | | | | | | |
| | | * | | | | Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-1249-314/+590
| | | |\ \ \ \ \
| | | * | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | | | | | | | |
| | | * | | | | | Handle HttpResponseException more safely for federated groupsTravis Ralston2018-09-261-2/+11
| | | | | | | | |
| | | * | | | | | Fix exception documentation in matrixfederationclient.pyTravis Ralston2018-09-261-6/+6
| | | | | | | | |
| | * | | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-232-7/+11
| | | | | | | | |
| | * | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-235-80/+96
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064
| | * | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-221-8/+22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Run MAU queries as background processes
| | | * | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-201-8/+22
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | Fixes #3820
| | * | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-222-10/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make psutil an explicit dependency
| | | * | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-192-10/+5
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062.
| | * / / / / / Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵Amber Brown2018-10-209-71/+70
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | on py3) (#4068)
| | * | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065Richard van der Hoff2018-10-192-28/+20
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Calculate absolute path for email templates
| | | * | | | | Calculate absolute path for email templatesRichard van der Hoff2018-10-192-28/+20
| | | | | | | |
| | * | | | | | Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-191-0/+2
| | | | | | | |
| | * | | | | | Make the metrics less racy (#4061)Amber Brown2018-10-192-16/+21
| | | | | | | |
| | * | | | | | make a bytestringAmber Brown2018-10-191-2/+2
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'master' into developRichard van der Hoff2018-10-1811-5/+369
| | |\| | | |
| | | * | | | 0.33.7 v0.33.7Richard van der Hoff2018-10-181-1/+1
| | | | | | |
| | | * | | | v0.33.7rc2Richard van der Hoff2018-10-171-1/+1
| | | | | | |
| | | * | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-174-35/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id.
| | | * | | | Put the warning blob at the top of the fileRichard van der Hoff2018-10-171-6/+9
| | | | | | |
| | | * | | | Ship the email templates as package_dataRichard van der Hoff2018-10-1710-4/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the example email templates into the synapse package so that they can be used as package data, which should mean that all of the packaging mechanisms (pip, docker, debian, arch, etc) should now come with the example templates. In order to grandfather in people who relied on the templates being in the old place, check for that situation and fall back to using the defaults if the templates directory does not exist.
| | | * | | | version bumpAmber Brown2018-10-151-1/+1
| | | | | | |
| | * | | | | Fix bug where we raised StopIteration in a generatorErik Johnston2018-10-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This made python 3.7 unhappy
| | * | | | | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-172-3/+10
| | | | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!!
| | * | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-164-35/+25
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id.
| | * | | | Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-163-61/+63
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve logging: log things in the right order, include destination and txids in all log lines, don't log successful responses twice - Fix the docstring on TransportLayerClient.send_transaction - Don't use treq.request, which is overcomplicated for our purposes: just use a twisted.web.client.Agent. - simplify the logic for setting up the bodyProducer - fix bytes/str confusions
| | * | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-158-0/+1044
| | |\ \ \ | | | | | | | | | | | | E2E backups
| | | * | | missed oneDavid Baker2018-10-121-0/+1
| | | | | |
| | | * | | Linting soothes the savage PEP8 monsterDavid Baker2018-10-121-4/+9
| | | | | |
| | | * | | Misc PR feedback bitsDavid Baker2018-10-121-2/+2
| | | | | |
| | | * | | Don't mangle exceptionsDavid Baker2018-10-121-4/+2
| | | | | |
| | | * | | Split /room_keys/version into 2 servletsDavid Baker2018-10-121-9/+21
| | | | | |
| | | * | | PR feedback pt. 1David Baker2018-10-123-29/+22
| | | | | |
| | | * | | Fix mergefailDavid Baker2018-10-091-1/+1
| | | | | |
| | | * | | isortDavid Baker2018-10-091-1/+1
| | | | | |
| | | * | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-09115-1523/+2315
| | | |\ \ \
| | | * | | | Apparently this blank line is Very ImportantDavid Baker2018-10-091-0/+1
| | | | | | |
| | | * | | | be python3 compatibleDavid Baker2018-10-091-2/+3
| | | | | | |
| | | * | | | Don't reuse backup versionsDavid Baker2018-10-052-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't actually delete the keys, just mark the versions as deleted in the db rather than actually deleting them, then we won't reuse versions. Fixes https://github.com/vector-im/riot-web/issues/7448
| | | * | | | WIP e2e key backupsDavid Baker2018-09-132-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continues from uhoreg's branch This just fixed the errcode on /room_keys/version if no backup and updates the schema delta to be on the latest so it gets run
| | | * | | | try to make flake8 and isort happyHubert Chathi2018-09-064-4/+10
| | | | | | |
| | | * | | | update to newer Synapse APIsHubert Chathi2018-08-241-1/+1
| | | | | | |
| | | * | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-24116-1483/+3715
| | | |\ \ \ \
| | | * | | | | allow session_data to be any JSON instead of just a stringHubert Chathi2018-08-211-2/+4
| | | | | | | |
| | | * | | | | allow auth_data to be any JSON instead of a stringHubert Chathi2018-08-211-2/+5
| | | | | | | |
| | | * | | | | missing importMatthew Hodgson2018-08-121-1/+1
| | | | | | | |
| | | * | | | | missing importMatthew Hodgson2018-08-121-0/+1
| | | | | | | |
| | | * | | | | use parse_stringMatthew Hodgson2018-08-121-3/+3
| | | | | | | |
| | | * | | | | 404 nicely if you try to interact with a missing current versionMatthew Hodgson2018-08-121-16/+35
| | | | | | | |
| | | * | | | | support DELETE /version with no argsMatthew Hodgson2018-08-122-3/+4
| | | | | | | |
| | | * | | | | flake8Matthew Hodgson2018-08-121-1/+1
| | | | | | | |
| | | * | | | | implement remaining tests and make them workMatthew Hodgson2018-08-123-8/+36
| | | | | | | |
| | | * | | | | fix idiocies and so make tests passMatthew Hodgson2018-08-122-3/+4
| | | | | | | |
| | | * | | | | don't needlessly return user_idMatthew Hodgson2018-08-121-1/+0
| | | | | | | |
| | | * | | | | improve docstringMatthew Hodgson2018-08-121-1/+5
| | | | | | | |
| | | * | | | | switch get_current_version_info back to being get_version_infoMatthew Hodgson2018-08-121-4/+7
| | | | | | | |
| | | * | | | | fix flakesMatthew Hodgson2018-08-122-4/+6
| | | | | | | |
| | | * | | | | fix typosMatthew Hodgson2018-08-122-2/+3
| | | | | | | |
| | | * | | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-122-9/+113
| | | | | | | |
| | | * | | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-121-20/+31
| | | | | | | |
| | | * | | | | more docstring for the e2e_room_keys restMatthew Hodgson2018-08-122-2/+51
| | | | | | | |
| | | * | | | | add storage docstring; remove unused set_e2e_room_keysMatthew Hodgson2018-08-121-36/+83
| | | | | | | |
| | | * | | | | fix factoring out of _should_replace_room_keyMatthew Hodgson2018-08-121-3/+4
| | | | | | | |
| | | * | | | | rename room_key_version table correctly, and fix opt argsMatthew Hodgson2018-08-122-16/+16
| | | | | | | |
| | | * | | | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-125-79/+99
| | | | | | | |
| | | * | | | | make /room_keys/version workMatthew Hodgson2018-08-124-15/+38
| | | | | | | |
| | | * | | | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-125-6/+171
| | | | | | | |
| | | * | | | | document the APIMatthew Hodgson2018-08-121-0/+133
| | | | | | | |
| | | * | | | | make it work and fix pep8Matthew Hodgson2018-08-127-82/+134
| | | | | | | |
| | | * | | | | interim WIP checkin; doesn't build yetMatthew Hodgson2018-08-123-19/+84
| | | | | | | |
| | | * | | | | total WIP skeleton for /room_keys APIMatthew Hodgson2018-08-124-0/+289
| | | | | | | |
| | * | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3Ivan Shapovalov2018-10-141-2/+2
| | | | | | | |
| | * | | | | | synapse/visibility.py: fix SyntaxError on py3.7Ivan Shapovalov2018-10-141-1/+1
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Make workers work on Py3 (#4027)Amber Brown2018-10-1311-61/+62
| | | | | | |
| | * | | | | Comments on get_all_new_events_streamRichard van der Hoff2018-10-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | just some docstrings to clarify the behaviour here
| | * | | | | Add description to counter metricErik Johnston2018-10-101-1/+5
| | | | | | |
| | * | | | | Track number of non-empty sync responses insteadErik Johnston2018-10-101-9/+15
| | | | | | |
| | * | | | | Append _total to metric and fix up spellingErik Johnston2018-10-101-2/+2
| | | | | | |
| | * | | | | Add metric to count lazy member sync requestsErik Johnston2018-10-091-6/+20
| | | | | | |
| | * | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptionsErik Johnston2018-10-092-13/+35
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | Log looping call exceptions
| | | * | | | Remove unnecessary extra function call layerErik Johnston2018-10-082-31/+16
| | | | | | |
| | | * | | | Use errback pattern and catch async failuresErik Johnston2018-10-082-15/+35
| | | | | | |
| | | * | | | Log looping call exceptionsErik Johnston2018-10-051-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a looping call function errors, then it kills the loop entirely. Currently it throws away the exception logs, so we should make it actually log them. Fixes #3929
| | * | | | | Optimisation for filter_events_for_serverRichard van der Hoff2018-10-081-7/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're better off hashing just the event_id than the whole ((type, state_key), event_id) tuple - so use a dict instead of a set. Also, iteritems > items.
| * | | | | isortNeil Johnson2018-10-241-2/+1
| | | | | |
| * | | | | remove trailing whiter spaceNeil Johnson2018-10-241-1/+1
| | | | | |
| * | | | | fix tupleRichard van der Hoff2018-10-241-1/+2
| | | | | | | | | | | | | | | | | | Co-Authored-By: neilisfragile <neil@matrix.org>
| * | | | | remove errant exception and styleNeil Johnson2018-10-232-6/+6
| | | | | |
| * | | | | clean up config error logic and importsNeil Johnson2018-10-172-19/+20
| | | | | |
| * | | | | no need to join room if creatorNeil Johnson2018-10-131-1/+2
| | | | | |
| * | | | | improve auto room join logic, comments and testsNeil Johnson2018-10-122-4/+18
| | | | | |
| * | | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-0417-130/+240
| |\| | | |
| | * | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-041-33/+69
| | |\ \ \ \ | | | | | | | | | | | | | | Fix bug in forward_extremity update logic
| | | * | | | actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| | | | | | |
| | | * | | | remove debuggingRichard van der Hoff2018-10-021-10/+0
| | | | | | |
| | | * | | | Fix bug in forward_extremity update logicRichard van der Hoff2018-10-021-33/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-2/+5
| | |\ \ \ \ \
| | | * | | | | full versionAmber Brown2018-10-041-1/+1
| | | | | | | |
| | | * | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-031-1/+4
| | | | | | | |
| | | * | | | | versionAmber Brown2018-10-031-1/+1
| | | |/ / / /
| | * | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-031-5/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fix handling of rejected threepid invites
| | | * | | | | Sanitise error messages when user doesn't have permission to inviteErik Johnston2018-10-031-5/+2
| | | | | | | |
| | | * | | | | Fix handling of rejected threepid invitesErik Johnston2018-10-031-1/+1
| | | |/ / / /
| | * | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-031-2/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fix exception in background metrics collection
| | | * | | | | 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.
| | * / / / / Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
| | |/ / / /
| | * | | | Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
| | | | | |
| | * | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-021-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Fix error handling for missing auth_event
| | | * \ \ \ Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0130-142/+299
| | | |\ \ \ \
| | | * | | | | 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-021-3/+10
| | | | | | |
| | * | | | | 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-022-22/+23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Avoid reraise, to improve stacktraces
| | | * | | | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-012-22/+23
| | | | |/ / / | | | |/| | |
| | * | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Fix lazy loaded sync with rejected state events
| | | * | | | 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.
| | * | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-12/+46
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fix exceptions when handling incoming transactions
| | | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-2720-36/+60
| | | |\ \ \ \ \
| | | * | | | | | 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-021-1/+1
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-012-3/+44
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 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-2827-403/+248
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-261-10/+17
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-255-21/+48
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | 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.
| | | * | | | | | | | 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
| | | | | | | | | | |
| | * | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-282-30/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove spurious federation checks on localhost
| | | * | | | | | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-282-1/+3
| | | | | | | | | | | |
| | | * | | | | | | | | 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).
| | * | | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-281-1/+0
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this got forgotten in #3932. We were getting away with it because it was the last call in this function.
| * | | | | | | | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-041-27/+18
| | | | | | | | | |
| * | | | | | | | | 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-271-3/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve performance of getting typing updates for replication
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1968-689/+1415
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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 #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-272-4/+10
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | Clarifications in FederationHandler
| | * | | | | | | | | more commentsRichard van der Hoff2018-09-272-6/+3
| | | | | | | | | | |
| | * | | | | | | | | 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-271-2/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Run notify_app_services as a bg process
| | * | | | | | | | | | 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-2716-17/+17
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replaced all occurences of e.message with str(e)
| | * | | | | | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-2716-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com>
| * | | | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-271-13/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-271-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | fix #3854 MAU transaction errors
| | * | | | | | | | | | fix #3854Neil Johnson2018-09-261-1/+4
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-272-2/+16
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Logging improvements
| | * | | | | | | | | | Logging improvementsRichard van der Hoff2018-09-262-2/+16
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some logging tweaks to help with debugging incoming federation transactions
| * | | | | | | | | | Include eventid in log lines when processing incoming federation ↵Richard van der Hoff2018-09-273-45/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-8/+22
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | I spent ages trying to figure out how I was going mad...
| * | | | | | | | | fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | trivial fixes for docstring
| * | | | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-262-20/+24
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | Fix ExpiringCache.__len__ to be accurate
| | * | | | | | | Log which cache is throwing exceptionsRichard van der Hoff2018-09-261-10/+17
| | | | | | | | |
| | * | | | | | | 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-261-284/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move synctl into top dir to avoid a symlink
| | * | | | | | | Move synctl into top dir to avoid a symlinkRichard van der Hoff2018-09-251-284/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-262-24/+47
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Comments and interface cleanup for on_receive_pdu
| | * | | | | | | 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 #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-2515-38/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | Fix some instances of ExpiringCache not expiring cache items
| | * | | | | | | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-2115-38/+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-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-14/+35
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix spurious exceptions when client closes conncetion
| | * | | | | | | | 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.
| * | | | | | | | | 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-251-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | bump versionAmber Brown2018-09-251-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into developAmber Brown2018-09-241-1/+1
| |\| | | | | | | | | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | update versionAmber Brown2018-09-241-1/+1
| | | | | | | | |
| | * | | | | | | versionAmber Brown2018-09-171-1/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-211-0/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle exceptions thrown by background tasks
| | * | | | | | | | Add missing loggerErik Johnston2018-09-201-0/+4
| | | | | | | | | |
| | * | | | | | | | 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-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Neilj/fix room invite mail links
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into ↵Richard van der Hoff2018-09-1813-39/+247
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_room_invite_mail_links
| | * | | | | | | | 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-202-16/+20
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-201-8/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove get_destination_retry_timings cache
| | * | | | | | | | Fix up changelog and remove spurious commentErik Johnston2018-09-191-2/+0
| | | | | | | | | |
| | * | | | | | | | pep8Erik Johnston2018-09-191-1/+0
| | | | | | | | | |
| | * | | | | | | | 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 regression test for logging on failed connections (#3912)Amber Brown2018-09-201-2/+2
| | | | | | | | | |
| * | | | | | | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-192-56/+110
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | FixupErik Johnston2018-09-191-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
| | | | | | | | |
| * | | | | | | | 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.
| * | | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-191-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix matrixfederationclient.py logging: Destination is a string
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 15:58:54 +0000