Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | preserve PLs | Richard van der Hoff | 2018-10-25 | 1 | -1/+7 |
| | |||||
* | preserve room visibility | Richard van der Hoff | 2018-10-25 | 2 | -4/+6 |
| | |||||
* | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 5 | -0/+208 |
| | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room. | ||||
* | Allow power_level_content_override=None for _send_events_for_new_room | Richard van der Hoff | 2018-10-25 | 1 | -5/+6 |
| | |||||
* | Make room_member_handler a member of RoomCreationHandler | Richard van der Hoff | 2018-10-25 | 2 | -8/+7 |
| | | | | ... to save passing it into `_send_events_for_new_room` | ||||
* | Factor _generate_room_id out of create_room | Richard van der Hoff | 2018-10-25 | 1 | -22/+23 |
| | | | | we're going to need this for room upgrades. | ||||
* | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 11 | -485/+714 |
| | | | | | | | | 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 remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-10-25 | 2 | -2/+12 |
|\ | |||||
| * | Merge pull request #4072 from steamp0rt/patch-1 | Richard van der Hoff | 2018-10-23 | 2 | -2/+12 |
| |\ | | | | | | | Add Caddy example to README | ||||
| | * | README.rst: fix minor grammar | Richard van der Hoff | 2018-10-22 | 1 | -3/+3 |
| | | | |||||
| | * | Whoops! | steamport | 2018-10-19 | 1 | -1/+1 |
| | | | |||||
| | * | I HATE RST | steamport | 2018-10-19 | 1 | -0/+1 |
| | | | |||||
| | * | Fix | steamport | 2018-10-19 | 1 | -3/+4 |
| | | | |||||
| | * | Fix formatting. | steamport | 2018-10-19 | 1 | -0/+1 |
| | | | |||||
| | * | Add CL | steamport | 2018-10-19 | 1 | -0/+1 |
| | | | |||||
| | * | Add Caddy example to README | steamport | 2018-10-19 | 1 | -0/+6 |
| |/ | |||||
* | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 8 | -15/+256 |
|\ \ | | | | | | | Add config option to control alias creation | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 91 | -948/+2364 |
| |\ \ | | | | | | | | | | | | | erikj/alias_disallow_list | ||||
| * | | | Use allow/deny | Erik Johnston | 2018-10-25 | 3 | -11/+11 |
| | | | | |||||
| * | | | Use match rather than search | Erik Johnston | 2018-10-24 | 1 | -2/+3 |
| | | | | |||||
| * | | | Add tests for alias creation rules | Erik Johnston | 2018-10-19 | 1 | -0/+48 |
| | | | | |||||
| * | | | Add tests for config generation | Erik Johnston | 2018-10-19 | 1 | -0/+67 |
| | | | | |||||
| * | | | Anchor returned regex to start and end of string | Erik Johnston | 2018-10-19 | 1 | -2/+6 |
| | | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 5 | -15/+135 |
| | | | | |||||
* | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 6 | -33/+94 |
|\ \ \ \ | |_|/ / |/| | | | fix race condiftion in calling initialise_reserved_users | ||||
| * | | | add new line | Neil Johnson | 2018-10-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | improve comments | Neil Johnson | 2018-10-25 | 1 | -6/+6 |
| | | | | |||||
| * | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 4 | -18/+51 |
| | | | | |||||
| * | | | commit transaction before closing | Neil Johnson | 2018-10-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 50 | -383/+1704 |
| |\ \ \ | |||||
| * | | | | remove white space | Neil Johnson | 2018-10-23 | 2 | -3/+1 |
| | | | | | |||||
| * | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 5 | -27/+55 |
| | | | | | |||||
* | | | | | Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin | Neil Johnson | 2018-10-25 | 6 | -23/+101 |
|\ \ \ \ \ | | | | | | | | | | | | | Autocreate autojoin rooms | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 142 | -1205/+4207 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | matthew/autocreate_autojoin | ||||
* | | | | | | oops, run the check_isort build | Richard van der Hoff | 2018-10-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Only cache the wheels | Richard van der Hoff | 2018-10-25 | 1 | -2/+10 |
| | | | | | | |||||
* | | | | | | Combine the pep8 and check_isort builds into one | Richard van der Hoff | 2018-10-25 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | there's really no point spinning up two separate jobs for these. | ||||
* | | | | | | disable coverage checking | Richard van der Hoff | 2018-10-25 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think we ever use this, and it slows things down. If we want to use it, we should just do so on a couple of builds rather than all of them. | ||||
* | | | | | | only fetch develop for check-newsfragments | Richard van der Hoff | 2018-10-24 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Disable newsfragment checks on branch builds | Richard van der Hoff | 2018-10-24 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | reduce git clone depth | Richard van der Hoff | 2018-10-24 | 1 | -0/+4 |
| |_|/ / / |/| | | | | |||||
* | | | | | fix branch regexp | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | also build on release branches | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Disable travis-ci branch builds for most branches | Richard van der Hoff | 2018-10-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (We really don't need to kick off 10 builds for the branch as well as 10 for the PR) | ||||
* | | | | | Merge pull request #4083 from matrix-org/rav/fix_event_filter_validation | Richard van der Hoff | 2018-10-24 | 3 | -2/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow backslashes in event field filters | ||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-10-24 | 21 | -81/+1344 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | rav/fix_event_filter_validation | ||||
* | | | | | | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 12 | -20/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix a number of flake8 errors | ||||
| * | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 12 | -20/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_rebase | Erik Johnston | 2018-10-24 | 9 | -61/+1323 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add v2 state resolution algorithm | ||||
| * | | | | | | isort | Erik Johnston | 2018-10-24 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 5 | -13/+13 |
| | | | | | | | |||||
| * | | | | | | Update event_auth table for rejected events | Erik Johnston | 2018-10-16 | 1 | -15/+21 |
| | | | | | | | |||||
| * | | | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | | | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-16 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add some state res v2 tests | Erik Johnston | 2018-10-16 | 2 | -0/+666 |
| | | | | | | | |||||
| * | | | | | | User event.sender rather than alias event.user_id | Erik Johnston | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add v2 state res algorithm. | Erik Johnston | 2018-10-16 | 3 | -24/+616 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hook this up to the vdh test room version. | ||||
| | * | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 3 | -2/+16 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_logcontexts | Richard van der Hoff | 2018-10-24 | 8 | -141/+142 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| * | | | | | | Fix start_pushers vs _start_pushers confusion | Richard van der Hoff | 2018-10-24 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | sanity-check the is_processing flag | Richard van der Hoff | 2018-10-24 | 2 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and rename it, for even more sanity | ||||
| * | | | | | | Changelog | Richard van der Hoff | 2018-10-22 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Run PusherPool.start as a background process | Richard van der Hoff | 2018-10-22 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't do anything with the result, so this is needed to give this code a logcontext. | ||||
| * | | | | | | Make on_started synchronous too | Richard van der Hoff | 2018-10-22 | 3 | -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 pusherpool | Richard van der Hoff | 2018-10-22 | 7 | -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 logcontext | Richard van der Hoff | 2018-10-22 | 2 | -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 down | Richard van der Hoff | 2018-10-22 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplifies the interface to _start_pushers | ||||
| * | | | | | | Factor PusherPool._start_pusher out of _start_pushers | Richard van der Hoff | 2018-10-22 | 1 | -18/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and use it from start_pusher_by_id. This mostly simplifies start_pusher_by_id. | ||||
| * | | | | | | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 2 | -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_creation | Erik Johnston | 2018-10-24 | 4 | -64/+56 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Clean up room alias creation | ||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 3 | -64/+55 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 3 | -8/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups | ||||
| * | | | | | | | Comments help | Travis Ralston | 2018-10-23 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | isort | Travis Ralston | 2018-10-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | More sane handling of group errors and pep8 | Travis Ralston | 2018-10-12 | 1 | -4/+5 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 120 | -924/+1167 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Changelog | Travis Ralston | 2018-09-26 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Handle HttpResponseException more safely for federated groups | Travis Ralston | 2018-09-26 | 1 | -2/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix exception documentation in matrixfederationclient.py | Travis Ralston | 2018-09-26 | 1 | -6/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 3 | -7/+12 |
| | | | | | | | | | |||||
* | | | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 6 | -80/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #3698 from spantaleev/add-matrix-docker-ansible-deploy | Richard van der Hoff | 2018-10-23 | 2 | -0/+7 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | Add information about the matrix-docker-ansible-deploy playbook | ||||
| * | | | | | | | | Add information about the matrix-docker-ansible-deploy playbook | Slavi Pantaleev | 2018-10-14 | 2 | -0/+7 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Slavi Pantaleev <slavi@devture.com> | ||||
* | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 2 | -8/+23 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Run MAU queries as background processes | ||||
| * | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 2 | -8/+23 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #3820 | ||||
* | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 3 | -10/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make psutil an explicit dependency | ||||
| * | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 3 | -10/+6 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | uh, Matrix is called Matrix these days... | Matthew Hodgson | 2018-10-21 | 1 | -2/+4 |
| | | | | | | | | |||||
* | | | | | | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵ | Amber Brown | 2018-10-20 | 27 | -518/+511 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | on py3) (#4068) | ||||
* | | | | | | | Merge branch 'rav/fix_email_templates_4065' into develop | Richard van der Hoff | 2018-10-19 | 2 | -8/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove notes on fallback for email_templates | Richard van der Hoff | 2018-10-19 | 2 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fallback didn't work, and was removed in #4069. | ||||
* | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 3 | -28/+21 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Calculate absolute path for email templates | ||||
| * | | | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 3 | -28/+21 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 2 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 3 | -16/+22 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3 | Richard van der Hoff | 2018-10-19 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Make manhole work on Python 3 again | ||||
| * | | | | | | changelog | Amber Brown | 2018-10-19 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4057 from matrix-org/rav/use_correct_python | Amber Brown | 2018-10-19 | 2 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use the right python when starting workers | ||||
| * | | | | | | Use the right python when starting workers | Richard van der Hoff | 2018-10-18 | 2 | -1/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | We should use the same python to start the workers as we do for the main synapse (ie, the same one used to run synctl.) | ||||
* | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 1 | -0/+17 |
|\| | | | | | |||||
| * | | | | | Add warnings about the upgrade to 0.33.7 github/release-v0.33.7 release-v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -0/+17 |
| | | | | | | |||||
* | | | | | | remove redundant changelog file | Richard van der Hoff | 2018-10-18 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | this change has been released | ||||
* | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 24 | -18/+101 |
|\| | | | | | |||||
| * | | | | | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 2 | -3/+6 |
| | | | | | | |||||
| * | | | | | fix changelog formatting v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | prep changelog | Richard van der Hoff | 2018-10-17 | 3 | -13/+25 |
| | | | | | | |||||
| * | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 5 | -35/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data | Richard van der Hoff | 2018-10-17 | 13 | -6/+53 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Ship the email templates as package_data | ||||
| | * | | | | | Put the warning blob at the top of the file | Richard van der Hoff | 2018-10-17 | 1 | -6/+9 |
| | | | | | | | |||||
| | * | | | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 13 | -6/+50 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | update changelog v0.33.7rc1 | Amber Brown | 2018-10-15 | 11 | -10/+28 |
| | | | | | | |||||
| * | | | | | update changelog | Amber Brown | 2018-10-15 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #4049 from matrix-org/erikj/synctl_colour | Erik Johnston | 2018-10-18 | 2 | -1/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Only colourise synctl output when attached to tty | ||||
| * | | | | | | Assume isatty is always defined, and catch AttributeError. Also don't bother ↵ | Erik Johnston | 2018-10-17 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking colour==Normal | ||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Only colourise synctl output when attached to tty | Erik Johnston | 2018-10-17 | 1 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4050 from matrix-org/erikj/fix_py37_iteration | Erik Johnston | 2018-10-17 | 2 | -2/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix bug where we raised StopIteration in a generator | ||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | This made python 3.7 unhappy | ||||
* | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 4 | -3/+50 |
| | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!! | ||||
* | | | | | | Merge pull request #4045 from matrix-org/rav/fix_get_missing_events | Richard van der Hoff | 2018-10-17 | 5 | -35/+26 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix incorrect truncation in get_missing_events | ||||
| * | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 5 | -35/+26 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | Merge pull request #4041 from matrix-org/rav/run_tests_in_docker | Amber Brown | 2018-10-17 | 3 | -43/+51 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | run the circle builds in docker containers | ||||
| * | | | | | Use wget rather than curl | Richard van der Hoff | 2018-10-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | the docker image doesn't have wget | ||||
| * | | | | | changelog | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | run the circle builds in docker containers | Richard van der Hoff | 2018-10-16 | 1 | -41/+48 |
|/ / / / / | | | | | | | | | | | | | | | | Docker containers spin up faster than entire VMs. | ||||
* / / / / | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 4 | -61/+64 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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_backups | David Baker | 2018-10-15 | 10 | -0/+1442 |
|\ \ \ \ | | | | | | | | | | | E2E backups | ||||
| * | | | | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | | | | | |||||
| * | | | | Misc PR feedback bits | David Baker | 2018-10-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| | | | | | |||||
| * | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 3 | -29/+22 |
| | | | | | |||||
| * | | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add changelog | David Baker | 2018-10-09 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 210 | -3221/+5551 |
| |\ \ \ \ | |||||
| * | | | | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Don't reuse backup versions | David Baker | 2018-10-05 | 2 | -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 backups | David Baker | 2018-09-13 | 2 | -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 happy | Hubert Chathi | 2018-09-06 | 5 | -8/+15 |
| | | | | | | |||||
| * | | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 2 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 232 | -4107/+7197 |
| |\ \ \ \ \ | |||||
| * | | | | | | allow session_data to be any JSON instead of just a string | Hubert Chathi | 2018-08-21 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | allow auth_data to be any JSON instead of a string | Hubert Chathi | 2018-08-21 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 2 | -16/+57 |
| | | | | | | | |||||
| * | | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 2 | -9/+14 |
| | | | | | | | |||||
| * | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 4 | -33/+287 |
| | | | | | | | |||||
| * | | | | | | linting | Matthew Hodgson | 2018-08-12 | 1 | -25/+23 |
| | | | | | | | |||||
| * | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 3 | -11/+15 |
| | | | | | | | |||||
| * | | | | | | first cut at a UT | Matthew Hodgson | 2018-08-12 | 1 | -0/+141 |
| | | | | | | | |||||
| * | | | | | | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 2 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 2 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 2 | -9/+113 |
| | | | | | | | |||||
| * | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -20/+31 |
| | | | | | | | |||||
| * | | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 2 | -2/+51 |
| | | | | | | | |||||
| * | | | | | | add storage docstring; remove unused set_e2e_room_keys | Matthew Hodgson | 2018-08-12 | 1 | -36/+83 |
| | | | | | | | |||||
| * | | | | | | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 2 | -16/+16 |
| | | | | | | | |||||
| * | | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 5 | -79/+99 |
| | | | | | | | |||||
| * | | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 4 | -15/+38 |
| | | | | | | | |||||
| * | | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 5 | -6/+171 |
| | | | | | | | |||||
| * | | | | | | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| | | | | | | | |||||
| * | | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 7 | -82/+134 |
| | | | | | | | |||||
| * | | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 3 | -19/+84 |
| | | | | | | | |||||
| * | | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 4 | -0/+289 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4033 from intelfx/py37-hotfixes | Amber Brown | 2018-10-15 | 3 | -3/+5 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | py3: python3.7 hotfixes | ||||
| * | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 2 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 2 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 13 | -62/+64 |
| | | | | | | |||||
* | | | | | | Comments on get_all_new_events_stream | Richard van der Hoff | 2018-10-12 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | just some docstrings to clarify the behaviour here | ||||
* | | | | | | Merge pull request #4022 from matrix-org/erikj/metrics_lazy_loaded_count | Erik Johnston | 2018-10-10 | 2 | -8/+33 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add metric to count lazy member sync requests | ||||
| * | | | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Update newsfile | Erik Johnston | 2018-10-10 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Track number of non-empty sync responses instead | Erik Johnston | 2018-10-10 | 1 | -9/+15 |
| | | | | | | | |||||
| * | | | | | | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-09 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions | Erik Johnston | 2018-10-09 | 3 | -13/+36 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Log looping call exceptions | ||||
| * | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 2 | -31/+16 |
| | | | | | | |||||
| * | | | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 2 | -15/+35 |
| | | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-10-05 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Log looping call exceptions | Erik Johnston | 2018-10-05 | 1 | -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 | ||||
* | | | | | | Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_server | Richard van der Hoff | 2018-10-09 | 2 | -7/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Optimisation for filter_events_for_server | ||||
| * | | | | | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 2 | -7/+7 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | | * | isort | Neil Johnson | 2018-10-24 | 1 | -2/+1 |
| | | | | | |||||
| | | | * | remove trailing whiter space | Neil Johnson | 2018-10-24 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | fix tuple | Richard van der Hoff | 2018-10-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Co-Authored-By: neilisfragile <neil@matrix.org> | ||||
| | | | * | Update changelog.d/3975.feature | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Co-Authored-By: neilisfragile <neil@matrix.org> | ||||
| | | | * | remove errant exception and style | Neil Johnson | 2018-10-23 | 3 | -7/+7 |
| | | | | | |||||
| | | | * | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 3 | -20/+21 |
| | | | | | |||||
| | | | * | no need to join room if creator | Neil Johnson | 2018-10-13 | 1 | -1/+2 |
| | | | | | |||||
| | | | * | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 4 | -9/+36 |
| | | | | | |||||
| | | | * | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 89 | -756/+721 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 2 | -33/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix bug in forward_extremity update logic | ||||
| * | | | | | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | fix newsfile name | Richard van der Hoff | 2018-10-03 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | remove debugging | Richard van der Hoff | 2018-10-02 | 1 | -10/+0 |
| | | | | | | |||||
| * | | | | | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 2 | -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 develop | Amber Brown | 2018-10-04 | 63 | -66/+88 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6 | Amber Brown | 2018-10-04 | 2 | -1/+9 |
| | | | | | | | |||||
| * | | | | | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4002 from matrix-org/rav/pin_prometheus | Richard van der Hoff | 2018-10-03 | 2 | -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 metrics | Richard van der Hoff | 2018-10-03 | 2 | -1/+5 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #3998 from ↵ | Richard van der Hoff | 2018-10-03 | 1 | -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 RCs | Michael Kaye | 2018-10-03 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note the regex must match the complete string anyway, so the leading ^ was useless. | ||||
| * | | | | | | some changelog fixes | Amber Brown | 2018-10-03 | 1 | -8/+4 |
| | | | | | | | |||||
| * | | | | | | changelog v0.33.6rc1 | Amber Brown | 2018-10-03 | 60 | -61/+75 |
| | | | | | | | |||||
| * | | | | | | version | Amber Brown | 2018-10-03 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 2 | -5/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix handling of rejected threepid invites | ||||
| * | | | | | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| | | | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix handling of rejected threepid invites | Erik Johnston | 2018-10-03 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 2 | -2/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix exception in background metrics collection | ||||
| * | | | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -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_handling | Erik Johnston | 2018-10-03 | 2 | -6/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix exception handling in fetching remote profiles | ||||
| * | | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache | Erik Johnston | 2018-10-02 | 3 | -1/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix bug when invalidating destination retry timings | ||||
| * | | | | | Add tests | Erik Johnston | 2018-10-02 | 1 | -0/+45 |
| | | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Remove Jenkins & other old dev junk (#3988) | Amber Brown | 2018-10-03 | 12 | -278/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix error handling for missing auth_event | ||||
| * \ \ \ \ | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 68 | -442/+779 |
| |\ \ \ \ \ | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -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 Brown | 2018-10-02 | 4 | -5/+18 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connection | Erik Johnston | 2018-10-02 | 2 | -6/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix error when logging incomplete requests | ||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -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_stacktraces | Richard van der Hoff | 2018-10-02 | 3 | -22/+24 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Avoid reraise, to improve stacktraces | ||||
| * | | | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 3 | -22/+24 |
| | |/ / / / / | |/| | | | | |