summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version and changelog to v0.18.6-rc3Mark Haines2017-01-052-1/+16
|
* Merge pull request #1766 from matrix-org/markjh/linear_loggingMatthew Hodgson2017-01-052-2/+13
|\ | | | | More logging for the linearizer and for get_events
| * More logging for the linearizer and for get_eventsMark Haines2017-01-052-2/+13
|/
* Merge pull request #1765 from matrix-org/markjh/timeout_get_missing_eventsMark Haines2017-01-053-3/+27
|\ | | | | cherrypick #1744: limit total timeout for get_missing_events to 10s
| * fix commentMatthew Hodgson2017-01-051-1/+17
| |
| * limit total timeout for get_missing_events to 10sMatthew Hodgson2017-01-053-3/+11
|/
* Merge pull request #1764 from matrix-org/markjh/fix_send_pduMark Haines2017-01-053-0/+25
|\ | | | | Only send events that originate on this server.
| * Only send events that originate on this server.Mark Haines2017-01-053-0/+25
|/ | | | | | Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed.
* Merge pull request #1758 from matrix-org/markjh/fix_ban_propagationMark Haines2017-01-041-6/+9
|\ | | | | Fix propagation of bans to remote servers.
| * Get the destinations from the state from before the eventMark Haines2017-01-041-8/+9
| | | | | | | | Rather than the state after then event.
| * Send ALL membership events to the server that was affected.Mark Haines2017-01-041-3/+5
|/ | | | | | Send all membership changes to the server that was affected. This ensures that if the last member of a room on a server was kicked or banned they get told about it.
* Bump version and changelog v0.18.6-rc2Mark Haines2016-12-302-1/+11
|
* Merge pull request #1736 from matrix-org/markjh/linearizer_loggingMark Haines2016-12-302-0/+14
|\ | | | | Add more useful logging when we block fetching events
| * s/aquire/acquire/gMark Haines2016-12-302-3/+3
| |
| * Add more useful logging when we block fetching eventsMark Haines2016-12-302-0/+14
|/
* Merge pull request #1734 from matrix-org/markjh/fix_get_missingMark Haines2016-12-301-69/+0
|\ | | | | Remove fallback from get_missing_events.
| * Remove fallback from get_missing_events.Mark Haines2016-12-301-69/+0
|/ | | | | | | get_missing_events used to fallback to fetching the missing events individually requesting from every server in the room, one by one.e This could be unacceptably slow, possibly causing #1732
* Merge pull request #1731 from matrix-org/markjh/logging-memleakMark Haines2016-12-301-3/+13
|\ | | | | Use the new twisted logging framework.
| * Use the new twisted logging framework.Mark Haines2016-12-301-3/+13
|/ | | | | Hopefully adding an observer to the new framework will avoid a memory leak https://twistedmatrix.com/trac/ticket/8164
* Bump changelog and version v0.18.6-rc1Mark Haines2016-12-292-1/+8
|
* Merge pull request #1725 from matrix-org/erikj/timeout_connMark Haines2016-12-292-7/+70
|\ | | | | Wrap connections in an N minute timeout to ensure they get reaped correctly
| * Manually abort the underlying TLS connection.Mark Haines2016-12-291-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | The abort() method calls loseConnection() which tries to shutdown the TLS connection cleanly. We now call abortConnection() directly which should promptly close both the TLS connection and the underlying TCP connection. I also added some TODO markers to consider cancelling the old previous timeout rather than checking time.time(). But given how urgently we want to get this code released I'd rather leave the existing code with the duplicate timeouts and the time.time() check.
| * Respect long_retries param and default to offErik Johnston2016-12-291-2/+2
| |
| * Spelling and commentsErik Johnston2016-12-291-4/+6
| |
| * Clean upErik Johnston2016-12-292-7/+4
| |
| * Wrap connections in an N minute timeout to ensure they get reaped correctlyErik Johnston2016-12-292-5/+61
| |
| * Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5Erik Johnston2016-12-16105-1213/+2917
| |\ | |/ |/|
* | Bump version and changelogErik Johnston2016-12-162-1/+10
| |
* | Merge pull request #1704 from matrix-org/rav/log_todevice_syncsRichard van der Hoff2016-12-152-5/+10
|\ \ | | | | | | Add some logging for syncing to_device events
| * | Add some logging for syncing to_device eventsRichard van der Hoff2016-12-152-5/+10
|/ / | | | | | | | | Attempt to track down the loss of to_device events (https://github.com/vector-im/riot-web/issues/2711 etc).
* | Merge pull request #1698 from matrix-org/erikj/room_listErik Johnston2016-12-151-2/+4
|\ \ | | | | | | Fix caching on public room list
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_listErik Johnston2016-12-132-1/+35
| |\ \
| * | | Fix caching on public room listErik Johnston2016-12-131-2/+4
| | | |
* | | | Merge pull request #1702 from manuroe/mac_install_updateErik Johnston2016-12-151-0/+1
|\ \ \ \ | | | | | | | | | | Update prerequisites instructions on Mac OS
| * | | | Update prerequisites instructions on Mac OSmanuroe2016-12-151-0/+1
|/ / / /
* | | | Merge pull request #1700 from matrix-org/erikj/backfill_filterErik Johnston2016-12-151-2/+5
|\ \ \ \ | | | | | | | | | | Fix /backfill returning events it shouldn't
| * | | | CommentErik Johnston2016-12-141-0/+2
| | | | |
| * | | | Fix /backfill returning events it shouldn'tErik Johnston2016-12-141-2/+3
| | | | |
* | | | | Merge pull request #1701 from mbachry/fix-preview-crashErik Johnston2016-12-152-1/+54
|\ \ \ \ \ | |/ / / / |/| | | | Fix crash in url preview
| * | | | Fix crash in url preview when html tag has no textMarcin Bachry2016-12-142-1/+54
|/ / / / | | | | | | | | | | | | Signed-off-by: Marcin Bachry <hegel666@gmail.com>
* | / / Fixup membership queryErik Johnston2016-12-141-2/+2
| |/ / |/| |
* | | Update changelog v0.18.5-rc3 github/release-v0.18.5 release-v0.18.5Erik Johnston2016-12-131-1/+1
| | |
* | | Bump changelog and versionErik Johnston2016-12-132-1/+35
|/ /
* | Merge pull request #1697 from matrix-org/erikj/fix_bg_memberErik Johnston2016-12-121-1/+1
|\ \ | | | | | | Fix background update that prematurely stopped
| * | Fix background update that prematurely stoppedErik Johnston2016-12-121-1/+1
| | |
* | | Merge pull request #1676 from matrix-org/erikj/room_listErik Johnston2016-12-1215-42/+399
|\ \ \ | |/ / |/| | Add new API appservice specific public room list
| * | Rename network_id to instance_id on client sideErik Johnston2016-12-121-1/+1
| | |
| * | Add cache to get_public_room_ids_at_stream_idErik Johnston2016-12-122-1/+4
| | |
| * | Notify replication. Use correct network_idErik Johnston2016-12-121-1/+3
| | |
| * | DocstringErik Johnston2016-12-121-0/+12
| | |
| * | CommentsErik Johnston2016-12-073-2/+12
| | |
| * | Don't include appservice idErik Johnston2016-12-061-1/+0
| | |
| * | Add new API appservice specific public room listErik Johnston2016-12-0614-40/+371
| | |
* | | Merge pull request #1694 from matrix-org/rav/no_get_e2e_keysRichard van der Hoff2016-12-121-39/+4
|\ \ \ | | | | | | | | Remove unspecced GET endpoints for e2e keys
| * | | Remove unspecced GET endpoints for e2e keysRichard van der Hoff2016-12-121-39/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | GET /keys/claim is a terrible idea, since it isn't idempotent; also it throws 500 errors if you call it without all the right params. GET /keys/query is arguable, but it's unspecced, so let's get rid of it too to stop people relying on unspecced APIs.
* | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2016-12-121-4/+13
|\ \ \ | | |/ | |/|
| * | Merge pull request #1685 from matrix-org/rav/update_readme_for_testsRichard van der Hoff2016-12-121-5/+14
| |\ \ | | | | | | | | Update the readme to use trial
| | * | fix pythonpathRichard van der Hoff2016-12-091-1/+1
| | | |
| | * | Update the readme to use trialRichard van der Hoff2016-12-091-5/+14
| |/ /
* | | Merge pull request #1620 from matrix-org/erikj/concurrent_room_accessErik Johnston2016-12-123-27/+161
|\ \ \ | | | | | | | | Limit the number of events that can be created on a given room concurrently
| * | | CommentsErik Johnston2016-11-112-0/+15
| | | |
| * | | Limit the number of events that can be created on a given room concurretnlyErik Johnston2016-11-101-27/+31
| | | |
| * | | Add Limiter: limit concurrent access to resourceErik Johnston2016-11-102-0/+115
| | | |
* | | | Merge pull request #1686 from matrix-org/rav/fix_federation_key_failsRichard van der Hoff2016-12-121-0/+10
|\ \ \ \ | | | | | | | | | | E2E key query: handle federation fails
| * | | | Remove unused importRichard van der Hoff2016-12-121-1/+0
| | | | |
| * | | | E2E key query: handle federation failsRichard van der Hoff2016-12-091-0/+11
| | | | | | | | | | | | | | | | | | | | Don't fail the whole request if we can't connect to a particular server.
* | | | | Merge pull request #1684 from matrix-org/rav/no_run_tox_from_setupRichard van der Hoff2016-12-091-33/+40
|\ \ \ \ \ | | | | | | | | | | | | Don't try to run tox from setup.py
| * | | | | Implement a null 'test' commandRichard van der Hoff2016-12-091-2/+15
| | | | | |
| * | | | | Don't try to run tox from setup.pyRichard van der Hoff2016-12-091-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | Using tox to run the tests is a bad idea, as per the comments.
* | | | | | Merge pull request #1683 from matrix-org/erikj/notifier_sadnessErik Johnston2016-12-094-18/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix rare notifier bug where listeners dont timeout
| * | | | | Fix unit testsErik Johnston2016-12-091-0/+4
| | | | | |
| * | | | | Correctly handle timeout errorsErik Johnston2016-12-092-7/+20
| | | | | |
| * | | | | Fix rare notifier bug where listeners dont timeoutErik Johnston2016-12-092-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition that caused the notifier to 'miss' the timeout notification, since there were no other checks for the timeout this caused listeners to get stuck in a loop until something happened.
* | | | | | Fix broken README mergeRichard van der Hoff2016-12-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | When 546ec1a was merged into develop, I accidentally overwrote the change introduced in debbea5 (pr #1657). Reintroduce it.
* | | | | Merge pull request #1680 from matrix-org/erikj/joined_roomsErik Johnston2016-12-096-9/+165
|\ \ \ \ \ | | | | | | | | | | | | Add new room membership APIs
| * | | | | Add /room/<room_id>/joined_members APIErik Johnston2016-12-083-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns the currently joined members in the room with their display names and avatar urls. This is more efficient than /members for large rooms where you don't need the full events.
| * | | | | Add profile data to the room_membership table for joinsErik Johnston2016-12-084-0/+110
| | | | | |
| * | | | | Add joined_rooms servletErik Johnston2016-12-081-0/+17
| |/ / / /
* | | | | Merge pull request #1678 from matrix-org/rav/fix_receipt_notificationsRichard van der Hoff2016-12-082-2/+6
|\ \ \ \ \ | |/ / / / |/| | | | Read-receipt fixes
| * | | | Fix ignored read-receiptsRichard van der Hoff2016-12-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Don't ignore read-receipts which arrive in the same EDU as a read-receipt for an old event.
| * | | | Fix result of insert_receiptRichard van der Hoff2016-12-081-1/+1
|/ / / / | | | | | | | | | | | | This should fix the absence of notifications when new receipts arrive.
* | | | Merge pull request #1672 from williamleuschner/developErik Johnston2016-12-061-0/+30
|\ \ \ \ | | | | | | | | | | Add README instructions for OpenBSD installation
| * | | | Fix incorrect numbering on OpenBSD instructions caused by my own incompetenceWilliam Leuschner2016-12-061-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: William Leuschner <wel2138@rit.edu>
| * | | | Update incorrect information in README about ksh and sourceWilliam Leuschner2016-12-061-6/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: William Leuschner <wel2138@rit.edu>
| * | | | Add README instructions for OpenBSD installationWilliam Leuschner2016-12-051-0/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: William Leuschner <wel2138@rit.edu>
* | | | | Prevent user tokens being used as guest tokens (#1675)Richard van der Hoff2016-12-063-31/+115
| |_|_|/ |/| | | | | | | | | | | | | | | Make sure that a user cannot pretend to be a guest by adding 'guest = True' caveats.
* | | | Travis config (#1674)Richard van der Hoff2016-12-061-0/+17
| | | |
* | | | Merge pull request #1673 from matrix-org/rav/fix_tox_testsRichard van der Hoff2016-12-061-0/+7
|\ \ \ \ | |/ / / |/| | | Fix unittests under tox
| * | | Fix unittests under toxRichard van der Hoff2016-12-061-0/+7
| | | | | | | | | | | | | | | | | | | | We now need to set PYTHONPATH when running the unit tests; update tox config to do so.
* | | | Merge pull request #653 from matrix-org/erikj/preset_guest_joinErik Johnston2016-12-051-0/+10
|\ \ \ \ | | | | | | | | | | Enable guest access for private rooms by default
| * | | | Enable guest access for private rooms by defaultErik Johnston2016-03-171-0/+10
| | | | |
* | | | | Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_argsErik Johnston2016-12-051-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Log the args that we have on UI auth completion
| * | | | | Clarify that creds doesn not contain passwords.David Baker2016-11-241-1/+3
| | | | | |
| * | | | | Log the args that we have on UI auth completionDavid Baker2016-11-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be super helpful for debugging if we have more registration woes.
* | | | | | Merge pull request #1668 from pik/bug-console-filterErik Johnston2016-12-051-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Logging: Fix console filter breaking when level is DEBUG
| * | | | | Bugfix: Console logging handler missing default filterpik2016-12-031-0/+1
| | | | | |
* | | | | | Merge pull request #1671 from kyrias/fix-preview-testRichard van der Hoff2016-12-051-68/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix preview test
| * | | | | | test_preview: Fix incorrect wrappingJohannes Löthberg2016-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old test expected an incorrect wrapping due to the preview function not using unicode properly, so it got the wrong length. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
| * | | | | | Make test_preview use unicode stringsJohannes Löthberg2016-12-051-68/+68
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2016-12-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | README: fix linkRichard van der Hoff2016-12-031-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2016-12-032-187/+355
|\| | | |
| * | | | Merge pull request #1667 from matrix-org/rav/update_readmeRichard van der Hoff2016-12-032-192/+359
| |\ \ \ \ | | | | | | | | | | | | Updates to the README
| | * | | | README: review commentsRichard van der Hoff2016-12-021-32/+54
| | | | | | | | | | | | | | | | | | | | | | | | Minor updates post-review
| | * | | | README: rewrite federation sectionRichard van der Hoff2016-12-021-50/+55
| | | | | |
| | * | | | README: add reverse-proxying sectionRichard van der Hoff2016-12-021-0/+99
| | | | | |
| | * | | | README: Rewrite "Identity servers" sectionRichard van der Hoff2016-12-021-15/+22
| | | | | |
| | * | | | README: rewrite installation instructionsRichard van der Hoff2016-12-021-10/+57
| | | | | |
| | * | | | README: remove refs to demo clientRichard van der Hoff2016-12-021-36/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The demo client isn't really fit for purpose, so stop encouraging people to use it.
| | * | | | README: code quotesRichard van der Hoff2016-12-021-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add some syntax highlighting
| | * | | | README: "About matrix" updatesRichard van der Hoff2016-12-021-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove redundant "where's the spec" section: this would belong in "About matrix", but it's already there. - E2E is in beta rather than dev
| | * | | | README: Fix linksRichard van der Hoff2016-12-021-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of broken links
| | * | | | Rearrange the READMERichard van der Hoff2016-12-021-85/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some bits of the README around. No words were changed in the making of this commit.
| | * | | | rename CAPTCHA_SETUPRichard van der Hoff2016-12-012-8/+7
| |/ / / / | | | | | | | | | | | | | | | this is rst so name it accordingly
* | | | | Merge pull request #1664 from kyrias/preview-url-resource-encodingMatthew Hodgson2016-12-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | preview_url_resource: Ellipsis must be in unicode string
| * | | | | preview_url_resource: Ellipsis must be in unicode stringJohannes Löthberg2016-12-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* | | | | Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokensRichard van der Hoff2016-12-019-210/+26
|\ \ \ \ \ | | | | | | | | | | | | Stop generating refresh_tokens
| * | | | | Fix doc-stringRichard van der Hoff2016-12-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove refresh_token reference
| * | | | | fix importsRichard van der Hoff2016-11-301-3/+0
| | | | | |
| * | | | | Rip out more refresh_token codeRichard van der Hoff2016-11-307-160/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might as well treat all refresh_tokens as invalid. Just return a 403 from /tokenrefresh, so that we don't have a load of dead, untestable code hanging around. Still TODO: removing the table from the schema.
| * | | | | Merge branch 'develop' into rav/no_more_refresh_tokensRichard van der Hoff2016-11-3014-78/+94
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1660 from matrix-org/rav/better_content_type_validationRichard van der Hoff2016-11-301-18/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | More intelligent Content-Type parsing
| * | | | | | More intelligent Content-Type parsingRichard van der Hoff2016-11-301-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Content-Type is allowed to contain options (`; charset=utf-8`, for instance). We should allow that.
* | | | | | | Merge pull request #1656 from matrix-org/rav/remove_time_caveatRichard van der Hoff2016-11-307-36/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Stop putting a time caveat on access tokens
| * | | | | | | CommentsRichard van der Hoff2016-11-301-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update comments in verify_macaroon
| * | | | | | | Stop putting a time caveat on access tokensRichard van der Hoff2016-11-297-33/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats.
* | | | | | | Merge pull request #1653 from matrix-org/rav/guest_e2eRichard van der Hoff2016-11-295-14/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement E2E for guests
| * | | | | | | Allow guest access to endpoints for E2ERichard van der Hoff2016-11-253-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose /devices, /keys, and /sendToDevice to guest users, so that they can use E2E.
| * | | | | | | Give guest users a device_idRichard van der Hoff2016-11-252-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to create devices for guests so that they can use e2e, but we don't have anywhere to store it, so just use a fixed one.
* | | | | | | | Merge pull request #1657 from matrix-org/rav/hurry_up_pipRichard van der Hoff2016-11-292-10/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Let pip install multiple packages at once
| * | | | | | | Let pip install multiple packages at onceRichard van der Hoff2016-11-292-10/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pip can install multiple dependencies at the same time, so there is no need to use xargs -n1. It's significantly slower with -n1, so let's not do it with no reason.
| | * / / / / Stop generating refresh tokensRichard van der Hoff2016-11-284-45/+20
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins.
* | | | | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checksRichard van der Hoff2016-11-251-26/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove redundant list of known caveat prefixes
| * | | | | | Remove redundant list of known caveat prefixesRichard van der Hoff2016-11-241-26/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | Also add some comments.
* | | | | | Merge pull request #1650 from matrix-org/erikj/respect_ratelimitedErik Johnston2016-11-242-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correctly handle 500's and 429 on federation
| * | | | | | Use correct varErik Johnston2016-11-241-1/+1
| | | | | | |
| * | | | | | Correctly handle 500's and 429 on federationErik Johnston2016-11-242-1/+8
|/ / / / / /
* | | | | | Bump version and changelog v0.18.5-rc2Erik Johnston2016-11-242-1/+8
| | | | | |
* | | | | | Don't send old events as federationErik Johnston2016-11-241-1/+1
| | | | | |
* | | | | | Bump changelog and version v0.18.5-rc1Erik Johnston2016-11-242-1/+16
| |_|/ / / |/| | | |
* | | | | Merge pull request #1644 from matrix-org/erikj/efficient_notif_countsErik Johnston2016-11-232-8/+50
|\ \ \ \ \ | | | | | | | | | | | | More efficient notif count queries
| * | | | | CommentErik Johnston2016-11-231-1/+3
| | | | | |
| * | | | | More efficient notif count queriesErik Johnston2016-11-232-8/+48
|/ / / / /
* | | | | Merge pull request #1635 from matrix-org/erikj/split_out_fed_txnErik Johnston2016-11-2338-219/+1131
|\ \ \ \ \ | | | | | | | | | | | | Split out federation transaction sending to a worker
| * | | | | Shuffle receipt handler around so that worker apps don't need to load itErik Johnston2016-11-237-9/+11
| | | | | |
| * | | | | Fix testsErik Johnston2016-11-231-0/+1
| | | | | |
| * | | | | Ensure only main or federation_sender process can send federation trafficErik Johnston2016-11-233-5/+21
| | | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-11-2310-25/+396
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | erikj/split_out_fed_txn
| * | | | | | CommentErik Johnston2016-11-231-0/+3
| | | | | | |
| * | | | | | Explicit federation ackErik Johnston2016-11-233-8/+25
| | | | | | |
| * | | | | | Fix tests and flake8Erik Johnston2016-11-222-1/+1
| | | | | | |
| * | | | | | Invalidate retry cache in both directionsErik Johnston2016-11-226-27/+132
| | | | | | |
| * | | | | | CommentsErik Johnston2016-11-211-0/+2
| | | | | | |
| * | | | | | Add federation-sender to sytestErik Johnston2016-11-211-0/+1
| | | | | | |
| * | | | | | Add some metricsErik Johnston2016-11-211-48/+68
| | | | | | |
| * | | | | | CommentsErik Johnston2016-11-213-0/+41
| | | | | | |
| * | | | | | Remove explicit calls to send_pduErik Johnston2016-11-213-61/+9
| | | | | | |
| * | | | | | Fix testsErik Johnston2016-11-214-7/+24
| | | | | | |
| * | | | | | Store federation stream positions in the databaseErik Johnston2016-11-216-24/+94
| | | | | | |
| * | | | | | Handle sending events and device messages over federationErik Johnston2016-11-1714-55/+185
| | | | | | |
| * | | | | | Hook up the send queue and create a federation sender workerErik Johnston2016-11-168-22/+419
| | | | | | |
| * | | | | | Add initial cut of federation send queueErik Johnston2016-11-161-0/+174
| | | | | | |
| * | | | | | Use new federation_sender DIErik Johnston2016-11-167-63/+26
| | | | | | |
| * | | | | | Add transaction queue and transport layer to DIErik Johnston2016-11-165-10/+16
| | | | | | |
| * | | | | | Move logic into transaction_queueErik Johnston2016-11-163-19/+18
| | | | | | |
| * | | | | | Rename transaction queue functions to send_*Erik Johnston2016-11-162-12/+12
| | | | | | |
* | | | | | | Merge pull request #1641 from matrix-org/erikj/as_pushersErik Johnston2016-11-232-2/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Ignore AS users when fetching push rules
| * | | | | | Ignore AS users when fetching push rulesErik Johnston2016-11-232-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By ignoring AS users early on when fetching push rules for a room we can avoid needlessly hitting the DB and filling up the caches.
* | | | | | | Merge pull request #1640 from matrix-org/kegan/sync-perfKegsay2016-11-222-9/+51
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Return early on /sync code paths if a '*' filter is used
| * | | | | | Return early on /sync code paths if a '*' filter is usedKegan Dougal2016-11-222-9/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently very conservative in that it only does this if there is no `since` token. This limits the risk to clients likely to be doing one-off syncs (like bridges), but does mean that normal human clients won't benefit from the time savings here. If the savings are large enough, I would consider generalising this to just check the filter.
* | | | | | Merge pull request #1638 from matrix-org/kegan/sync-event-fieldsKegsay2016-11-224-15/+296
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Implement "event_fields" in filters
| * | | | | Review commentsKegan Dougal2016-11-222-21/+11
| | | | | |
| * | | | | Also check for dict since sometimes they aren't frozenKegan Dougal2016-11-221-1/+1
| | | | | |
| * | | | | Glue only_event_fields into the sync rest servletKegan Dougal2016-11-223-11/+15
| | | | | |
| * | | | | More testsKegan Dougal2016-11-222-4/+60
| | | | | |
| * | | | | Add remaining testsKegan Dougal2016-11-211-4/+70
| | | | | |
| * | | | | Start adding some testsKegan Dougal2016-11-212-4/+40
| | | | | |
| * | | | | Move event_fields filtering to serialize_eventKegan Dougal2016-11-213-59/+119
| | | | | | | | | | | | | | | | | | | | | | | | Also make it an inclusive not exclusive filter, as the spec demands.
| * | | | | Add filter_event_fields and filter_field to FilterCollectionKegan Dougal2016-11-211-0/+69
| |/ / / /
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-11-223-1/+40
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4Erik Johnston2016-11-2232-430/+383
| |\ \ \ \
| | * | | | Bump changelogErik Johnston2016-11-221-0/+8
| | | | | |
| | * | | | Merge branch 'dbkr/work_around_devicename_bug' of ↵Erik Johnston2016-11-221-0/+11
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into release-v0.18.4
| | | * | | | Fix flake8Mark Haines2016-11-181-1/+0
| | | | | | |
| | | * | | | Work around client replacing reg paramsDavid Baker2016-11-181-0/+12
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Works around https://github.com/vector-im/vector-android/issues/715 and equivalent for iOS
| | * | | | Bump changelog and version v0.18.4-rc1Erik Johnston2016-11-142-1/+21
| | | | | |
* | | | | | Merge pull request #1636 from matrix-org/kegan/filter-error-msgKegsay2016-11-212-0/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fail with a coherent error message if `/sync?filter=` is invalid
| * | | | | Fail with a coherent error message if `/sync?filter=` is invalidKegan Dougal2016-11-212-0/+9
|/ / / / /
* | | | | Merge pull request #1628 from matrix-org/erikj/ldap_split_outErik Johnston2016-11-154-378/+17
|\ \ \ \ \ | | | | | | | | | | | | Use external ldap auth pacakge
| * | | | | Use external ldap auth pacakgeErik Johnston2016-11-154-378/+17
| | | | | |
* | | | | | Merge pull request #1617 from matrix-org/erikj/intern_state_dictErik Johnston2016-11-151-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Correctly intern keys in state cache
| * | | | | Correctly intern keys in state cacheErik Johnston2016-11-081-1/+4
| | | | | |
* | | | | | New Flake8 fixesErik Johnston2016-11-152-0/+3
| |_|/ / / |/| | | |
* | | | | Merge pull request #1624 from matrix-org/kegan/idempotent-requestsKegsay2016-11-147-184/+202
|\ \ \ \ \ | | | | | | | | | | | | Store Promise<Response> instead of Response for HTTP API transactions
| * | | | | Clean transactions based on time. Add HttpTransactionCache tests.Kegan Dougal2016-11-145-8/+99
| | | | | |
| * | | | | Move .observe() up to the cache to make things neaterKegan Dougal2016-11-143-33/+11
| | | | | |
| * | | | | Review commentsKegan Dougal2016-11-115-158/+119
| | | | | |
| * | | | | More flake8Kegan Dougal2016-11-111-1/+3
| | | | | |
| * | | | | Flake8 and fix whoopsieKegan Dougal2016-11-111-4/+8
| | | | | |
| * | | | | Use ObservableDeferreds instead of Deferreds as they behave as intendedKegan Dougal2016-11-112-30/+31
| | | | | |
| * | | | | Use observable deferreds because they are saneKegan Dougal2016-11-111-3/+4
| | | | | |
| * | | | | Flake8Kegan Dougal2016-11-102-4/+4
| | | | | |
| * | | | | Store Promise<Response> instead of Response for HTTP API transactionsKegan Dougal2016-11-104-88/+68
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a race whereby: - User hits an endpoint. - No cached transaction so executes main code. - User hits same endpoint. - No cache transaction so executes main code. - Main code finishes executing and caches response and returns. - Main code finishes executing and caches response and returns. This race is common in the wild when Synapse is struggling under load. This commit fixes the race by: - User hits an endpoint. - Caches the promise to execute the main code and executes main code. - User hits same endpoint. - Yields on the same promise as the first request. - Main code finishes executing and returns, unblocking both requests.
* | | | | Merge pull request #1625 from DanielDent/patch-1Erik Johnston2016-11-121-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Add support for durations in minutes
| * | | | Add support for durations in minutesDaniel Dent2016-11-121-2/+3
| | |/ / | |/| |
* | | | Merge pull request #1619 from matrix-org/erikj/pwd_provider_errorErik Johnston2016-11-091-2/+7
|\ \ \ \ | | | | | | | | | | Don't assume providers raise ConfigError's
| * | | | Don't assume providers raise ConfigError'sErik Johnston2016-11-081-2/+7
|/ / / /
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-11-083-2/+16
|\| | |
| * | | Merge branch 'erikj/ldap3_auth' v0.18.3Erik Johnston2016-11-083-2/+16
| |\ \ \
| | * | | Bump version and changelogErik Johnston2016-11-082-1/+14
| | | | |
| | * | | Explicitly set authentication mode in ldap3Erik Johnston2016-11-081-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This only makes a difference for versions of ldap3 before 1.0, but a) its best to be explicit and b) there are distributions that package ancient versions for ldap3 (e.g. debian).
* | | | Merge pull request #1615 from matrix-org/erikj/limit_prev_eventsErik Johnston2016-11-081-0/+15
|\ \ \ \ | | | | | | | | | | Limit the number of prev_events of new events
| * | | | Sample correctlyErik Johnston2016-11-081-1/+3
| | | | |
| * | | | Limit the number of prev_events of new eventsErik Johnston2016-11-081-0/+13
| | |/ / | |/| |
* | | | Merge pull request #1616 from matrix-org/erikj/worker_frozen_dictErik Johnston2016-11-086-0/+22
|\ \ \ \ | |/ / / |/| | | Respect use_frozen_dicts option in workers
| * | | Respect use_frozen_dicts option in workersErik Johnston2016-11-086-0/+22
|/ / /
* | | Merge pull request #1198 from euank/more-ip-blacklistErik Johnston2016-11-071-0/+2
|\ \ \ | | | | | | | | default config: blacklist more internal ips
| * | | default config: blacklist more internal ipsEuan Kemp2016-11-061-0/+2
| |/ /
* | | Merge pull request #1195 from matrix-org/erikj/incorrect_funcErik Johnston2016-11-041-11/+2
|\ \ \ | | | | | | | | Remove unused but buggy function
| * | | CommentErik Johnston2016-11-041-0/+1
| | | |
| * | | Remove unused but buggy functionErik Johnston2016-11-041-11/+1
|/ / /
* | | Merge pull request #1193 from matrix-org/paul/metricsPaul Evans2016-11-033-71/+18
|\ \ \ | | | | | | | | More updates to Promethese metrics exposition
| * | | Fix copypasto error in metric rename table in docsPaul "LeoNerd" Evans2016-11-031-4/+4
| | | |
| * | | Rename the python-specific metrics now the docs claim that we have donePaul "LeoNerd" Evans2016-11-031-7/+9
| | | |
| * | | Since we don't export per-filetype fd counts any more, delete all the code ↵Paul "LeoNerd" Evans2016-11-031-36/+4
| | | | | | | | | | | | | | | | related to that too
| * | | Remove now-unused 'resource' importPaul "LeoNerd" Evans2016-11-031-8/+0
| | | |
| * | | Now we have new-style metrics don't bother exporting legacy-named process onesPaul "LeoNerd" Evans2016-11-031-16/+1
|/ / /
* | | Merge pull request #1192 from matrix-org/erikj/postgres_gistErik Johnston2016-11-033-1/+45
|\ \ \ | | | | | | | | Replace postgres GIN with GIST
| * | | Remove spurious commentErik Johnston2016-11-031-2/+2
| | | |
| * | | Replace postgres GIN with GISTErik Johnston2016-11-033-1/+45
|/ / / | | | | | | | | | | | | This is because GIN can be slow to write too, especially when the table gets large.
* | | Merge pull request #1191 from matrix-org/dbkr/non_ascii_passwordsDavid Baker2016-11-031-1/+1
|\ \ \ | | | | | | | | Don't error on non-ascii passwords
| * | | Don't error on non-ascii passwordsDavid Baker2016-11-031-1/+1
|/ / /
* | | Merge pull request #1190 from matrix-org/markjh/media_corsMark Haines2016-11-023-7/+22
|\ \ \ | | | | | | | | Set CORs headers on responses from the media repo
| * | | Set CORs headers on responses from the media repoMark Haines2016-11-023-7/+22
|/ / /
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-11-010-0/+0
|\| |
| * | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2Erik Johnston2016-11-0157-807/+1566
| |\ \
* | \ \ Merge pull request #1188 from matrix-org/erikj/sent_transactionsErik Johnston2016-11-011-150/+4
|\ \ \ \ | | | | | | | | | | Remove sent_transactions table.
| * | | | Continue to clean up received_transactionsErik Johnston2016-11-011-0/+14
| | | | |
| * | | | Removed unused stuffErik Johnston2016-10-311-163/+3
| | | | |
| * | | | Increase batching of sent transaction insertsErik Johnston2016-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should further reduce the number of individual inserts, transactions and updates that are required for keeping sent_transactions up to date.
* | | | | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into developErik Johnston2016-11-013-34/+66
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Bump version and changelogErik Johnston2016-11-012-1/+7
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2Erik Johnston2016-11-011-33/+42
| |\ \ \
| | * | | Merge pull request #1187 from matrix-org/paul/metrics-howtoPaul Evans2016-10-311-33/+42
| |/| | | |/| | | | | | | | | Update documentation about exported prometheus metrics
| | * | | Add details of renamed metricsPaul "LeoNerd" Evans2016-10-311-0/+34
| | | | |
| | * | | Remove long-deprecated instructions about promethesus console; also fix for ↵Paul "LeoNerd" Evans2016-10-281-33/+8
| |/ / / |/| | | | | | | | | | | modern config file format
| * | | Changelog formattting v0.18.2-rc5Erik Johnston2016-10-281-0/+1
| | | |
| * | | Bump changelog and versionMark Haines2016-10-282-1/+8
| | | |
| * | | Merge branch 'develop' into release-v0.18.2Mark Haines2016-10-283-9/+9
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1184 from matrix-org/paul/metricsPaul Evans2016-10-273-9/+9
|\ \ \ \ | | | | | | | | | | Bugfix for process-wide metric export on split processes
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 07:21:32 +0000