Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 31 | -368/+994 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 12 | -67/+665 |
| |\ | |||||
| | * | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | |\ | |||||
| | | * | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | * | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 6 | -61/+659 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | * | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 4 | -11/+11 |
| | | * | 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 |
| | | * | 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 |
| * | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| |/ / | |||||
| * | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 7 | -141/+141 |
| |\ \ | |||||
| | * | | 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 |
| | * | | Run PusherPool.start as a background process | Richard van der Hoff | 2018-10-22 | 1 | -5/+7 |
| | * | | Make on_started synchronous too | Richard van der Hoff | 2018-10-22 | 3 | -11/+21 |
| | * | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 7 | -50/+14 |
| | * | | Give pushers their own background logcontext | Richard van der Hoff | 2018-10-22 | 2 | -58/+54 |
| | * | | move get_all_pushers call down | Richard van der Hoff | 2018-10-22 | 1 | -3/+9 |
| | * | | Factor PusherPool._start_pusher out of _start_pushers | Richard van der Hoff | 2018-10-22 | 1 | -18/+33 |
| | * | | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 2 | -3/+4 |
| * | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 3 | -64/+55 |
| |\ \ \ | |||||
| | * | | | 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 | 2 | -8/+22 |
| |\ \ \ \ | |||||
| | * | | | | 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 | 49 | -314/+590 |
| | |\ \ \ \ | |||||
| | * | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | * | | | | | 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 | 2 | -7/+11 |
| * | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 5 | -80/+96 |
* | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 1 | -2/+1 |
* | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 3 | -25/+45 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 1 | -8/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -8/+22 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 2 | -10/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 2 | -10/+5 |
| |/ / / / / | |||||
* / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on... | Amber Brown | 2018-10-20 | 9 | -71/+70 |
|/ / / / / | |||||
* | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
* | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 1 | -0/+2 |
* | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 2 | -16/+21 |
* | | | | | | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 11 | -5/+369 |
|\| | | | | |||||
| * | | | | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -1/+1 |
| * | | | | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 |
| * | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 4 | -35/+25 |
| * | | | | 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 | 10 | -4/+365 |
| * | | | | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 |
* | | | | | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
* | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 2 | -3/+10 |
* | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 4 | -35/+25 |
| |_|_|/ |/| | | | |||||
* | | | | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 3 | -61/+63 |
|/ / / | |||||
* | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 8 | -0/+1044 |
|\ \ \ | |||||
| * | | | 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 |
| * | | | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 115 | -1523/+2315 |
| |\ \ \ | |||||
| * | | | | 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 |
| * | | | | WIP e2e key backups | David Baker | 2018-09-13 | 2 | -4/+10 |
| * | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 4 | -4/+10 |
| * | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| * | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 116 | -1483/+3715 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 1 | -16/+35 |
| * | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| * | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| * | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 3 | -8/+36 |
| * | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| * | | | | | 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 |
* | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 1 | -2/+2 |
* | | | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 11 | -61/+62 |
* | | | | | Comments on get_all_new_events_stream | Richard van der Hoff | 2018-10-12 | 1 | -1/+15 |
* | | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
* | | | | | 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 |
* | | | | | 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 | 2 | -13/+35 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | 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 |
| * | | | | Log looping call exceptions | Erik Johnston | 2018-10-05 | 1 | -1/+18 |
* | | | | | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 1 | -7/+6 |
|/ / / / | |||||
* | | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 1 | -33/+69 |
|\ \ \ \ | |||||
| * | | | | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| * | | | | 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 | 1 | -33/+78 |
* | | | | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 2 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| * | | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 1 | -1/+4 |
| * | | | | | 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 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| * | | | | | 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 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| |/ / / / | |||||
* / / / / | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
|/ / / / | |||||
* | | | | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
* | | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 30 | -142/+299 |
| |\ \ \ \ | |||||
| * | | | | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 1 | -3/+10 |
* | | | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
* | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 2 | -22/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 2 | -22/+23 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
* | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -12/+46 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 20 | -36/+60 |
| |\ \ \ \ \ | |||||
| * | | | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| * | | | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| * | | | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
* | | | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 2 | -3/+44 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly match 'dict.pop' api | Erik Johnston | 2018-10-01 | 1 | -3/+11 |
| * | | | | | | Don't update eviction metrics on explicit removal | Erik Johnston | 2018-10-01 | 1 | -5/+0 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-28 | 27 | -403/+248 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 5 | -21/+48 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-21 | 1 | -12/+9 |
| * | | | | | | | | Add a five minute cache to get_destination_retry_timings | Erik Johnston | 2018-09-21 | 2 | -1/+35 |
| * | | | | | | | | Make ExpiringCache slightly more performant | Erik Johnston | 2018-09-21 | 1 | -1/+5 |
* | | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 2 | -30/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 2 | -1/+3 |
| * | | | | | | | | | remove spurious federation checks on localhost | Richard van der Hoff | 2018-09-26 | 1 | -31/+6 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 1 | -1/+0 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 1 | -3/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 68 | -689/+1415 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
* | | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 2 | -6/+3 |
| * | | | | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
* | | | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process | Amber Brown | 2018-09-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Run notify_app_services as a bg process | Richard van der Hoff | 2018-09-26 | 1 | -2/+6 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 16 | -17/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 16 | -17/+17 |
* | | | | | | | | | | | Run our oldest supported configuration in CI (#3952) | Amber Brown | 2018-09-27 | 1 | -13/+14 |
* | | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts | Richard van der Hoff | 2018-09-27 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | fix #3854 | Neil Johnson | 2018-09-26 | 1 | -1/+4 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 2 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 2 | -2/+16 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 3 | -45/+93 |
* | | | | | | | | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 1 | -8/+22 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | fix docstring for FederationClient.get_state_for_room | Richard van der Hoff | 2018-09-26 | 1 | -4/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len | Richard van der Hoff | 2018-09-26 | 2 | -20/+24 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Log which cache is throwing exceptions | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| * | | | | | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-26 | 1 | -10/+7 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctl | Amber Brown | 2018-09-26 | 1 | -284/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move synctl into top dir to avoid a symlink | Richard van der Hoff | 2018-09-25 | 1 | -284/+0 |
* | | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 2 | -24/+47 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 2 | -24/+47 |
* | | | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 15 | -38/+12 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 15 | -38/+12 |
* | | | | | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 1 | -14/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix spurious exceptions when client closes conncetion | Erik Johnston | 2018-09-20 | 1 | -14/+35 |
* | | | | | | | | | We require attrs 16.0.0 | Richard van der Hoff | 2018-09-25 | 1 | -1/+3 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -5/+8 |
* | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bump version | Amber Brown | 2018-09-25 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 1 | -1/+1 |
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | update version | Amber Brown | 2018-09-24 | 1 | -1/+1 |
| * | | | | | | | version | Amber Brown | 2018-09-17 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errors | Erik Johnston | 2018-09-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing logger | Erik Johnston | 2018-09-20 | 1 | -0/+4 |
| * | | | | | | | | Handle exceptions thrown by background tasks | Erik Johnston | 2018-09-20 | 1 | -0/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+4 |
* | | | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links | Neil Johnson | 2018-09-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail... | Richard van der Hoff | 2018-09-18 | 13 | -39/+247 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix link for case that config.email_riot_base_url is set | Neil Johnson | 2018-09-13 | 1 | -1/+1 |
* | | | | | | | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 2 | -16/+20 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cache | Erik Johnston | 2018-09-20 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix up changelog and remove spurious comment | Erik Johnston | 2018-09-19 | 1 | -2/+0 |
| * | | | | | | | | pep8 | Erik Johnston | 2018-09-19 | 1 | -1/+0 |
| * | | | | | | | | Remove get_destination_retry_timings cache | Erik Johnston | 2018-09-19 | 1 | -5/+0 |
* | | | | | | | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 1 | -2/+2 |
* | | | | | | | | | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 2 | -56/+110 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Fixup | Erik Johnston | 2018-09-19 | 1 | -4/+1 |
* | | | | | | | | Replace custom DeferredTimeoutError with defer.TimeoutError | Erik Johnston | 2018-09-19 | 2 | -12/+5 |
* | | | | | | | | Run canceller first to allow it to generate correct error | Erik Johnston | 2018-09-19 | 1 | -2/+5 |
* | | | | | | | | Update to use new timeout function everywhere. | Erik Johnston | 2018-09-19 | 4 | -72/+43 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1 | Amber Brown | 2018-09-19 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Destination is a string | Travis Ralston | 2018-09-18 | 1 | -4/+4 |
* | | | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name | Amber Brown | 2018-09-19 | 1 | -3/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Set SNI to the server_name, not whatever was in the SRV record | Richard van der Hoff | 2018-09-18 | 1 | -3/+10 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 1 | -1/+30 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
| |/ / / / / / | |||||
* | | | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 1 | -0/+5 |
* | | | | | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 1 | -149/+236 |
* | | | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_version | Amber Brown | 2018-09-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | typo | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | | | make pip happy? | Will Hunt | 2018-09-17 | 1 | -2/+4 |
| * | | | | | | Use a string for versions | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | | | Add python_version phone home stat | Will Hunt | 2018-09-17 | 1 | -0/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias | Richard van der Hoff | 2018-09-18 | 2 | -4/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| * | | | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 2 | -4/+16 |
| |/ / / / / | |||||
* | | | | | | Fix more b'abcd' noise in metrics | Richard van der Hoff | 2018-09-17 | 2 | -12/+12 |
* | | | | | | Fix some b'abcd' noise in logs and metrics | Richard van der Hoff | 2018-09-17 | 2 | -5/+8 |
|/ / / / / | |||||
* | | | | | Fix timeout function | Erik Johnston | 2018-09-15 | 1 | -1/+2 |
* | | | | | Add an awful secondary timeout to fix wedged requests | Erik Johnston | 2018-09-14 | 2 | -0/+62 |
* | | | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -8/+1 |
* | | | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 4 | -7/+12 |
|\ \ \ \ \ | |||||
| * | | | | | fix | Amber Brown | 2018-09-15 | 1 | -3/+3 |
| * | | | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+4 |
| * | | | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+1 |
| * | | | | | redact better | Amber Brown | 2018-09-14 | 1 | -2/+2 |
| * | | | | | we do that higher up | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| * | | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 | Amber Brown | 2018-09-14 | 4 | -15/+36 |
| |\| | | | | |||||
| * | | | | | buffer? | Amber Brown | 2018-09-14 | 1 | -1/+2 |
* | | | | | | Remove spurious comment | Erik Johnston | 2018-09-14 | 1 | -2/+0 |
* | | | | | | Measure outbound requests | Erik Johnston | 2018-09-14 | 1 | -3/+6 |
* | | | | | | Add in flight real time metrics for Measure blocks | Erik Johnston | 2018-09-14 | 2 | -1/+131 |
* | | | | | | Fix minor typo in exception | Travis Ralston | 2018-09-13 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | merge (#3576) | Amber Brown | 2018-09-14 | 4 | -15/+36 |
|/ / / / | |||||
* | | | | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8 | Erik Johnston | 2018-09-13 | 1 | -16/+28 |
|\ \ \ \ |