summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2178 from matrix-org/erikj/message_metricsErik Johnston2017-05-027-5/+32
|\ | | | | Add more granular event send metrics
| * Add more granular event send metricsErik Johnston2017-05-027-5/+32
| |
* | Merge pull request #2180 from matrix-org/rav/fix_timeout_on_timeoutRichard van der Hoff2017-05-021-1/+1
|\ \ | |/ |/| Instantiate DeferredTimedOutError correctly
| * Instantiate DeferredTimedOutError correctlyRichard van der Hoff2017-05-021-1/+1
| | | | | | | | | | | | Call `super` correctly, so that we correctly initialise the `errcode` field. Fixes https://github.com/matrix-org/synapse/issues/2179.
* | Merge pull request #2080 from matrix-org/erikj/filter_speedErik Johnston2017-04-284-40/+24
|\ \ | |/ |/| Speed up filtering of a single event in push
| * Remove unused importErik Johnston2017-04-281-1/+0
| |
| * We don't care about forgotten roomsErik Johnston2017-04-281-12/+0
| |
| * Speed up filtering of a single event in pushErik Johnston2017-04-284-40/+37
| |
* | Merge pull request #2163 from matrix-org/erikj/fix_invite_stateErik Johnston2017-04-273-7/+26
|\ \ | | | | | | Fix invite state to always include all events
| * | Comment and remove spurious loggingErik Johnston2017-04-272-1/+3
| | |
| * | Fix testsErik Johnston2017-04-261-3/+3
| | |
| * | Fix invite state to always include all eventsErik Johnston2017-04-263-7/+24
| |/
* | Merge pull request #2127 from APwhitehat/alreadystartedErik Johnston2017-04-271-0/+3
|\ \ | | | | | | print something legible if synapse already running
| * | synctl.py: Check if synapse is already runningAnant Prakash2017-04-131-0/+3
| | |
* | | Merge pull request #2131 from matthewjwolff/developErik Johnston2017-04-273-4/+13
|\ \ \ | | | | | | | | web_client_location documentation fix
| * | | Queried CONDITIONAL_REQUIREMENTSMatthew Wolff2017-04-181-2/+5
| | | |
| * | | Fixed travis build failureMatthew Wolff2017-04-171-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com>
| * | | web_server_root documentation fixMatthew Wolff2017-04-173-4/+12
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com>
* | | | Fix bgupdate error if index already exists (#2167)Richard van der Hoff2017-04-271-30/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new table index in the background, guard against it existing already. Fixes https://github.com/matrix-org/synapse/issues/2135. Also, make sure we restore the autocommit flag when we're done, otherwise we get more failures from other operations later on. Fixes https://github.com/matrix-org/synapse/issues/1890 (hopefully).
* | | | Merge pull request #2168 from matrix-org/erikj/federation_loggingErik Johnston2017-04-271-2/+22
|\ \ \ \ | | | | | | | | | | Add some extra logging for edge cases of federation
| * | | | TypoErik Johnston2017-04-271-1/+1
| | | | |
| * | | | Add some extra logging for edge cases of federationErik Johnston2017-04-271-2/+22
| | |_|/ | |/| |
* | | | Merge pull request #2130 from APwhitehat/roomexistsErik Johnston2017-04-271-1/+5
|\ \ \ \ | |/ / / |/| | | Check that requested room_id exists
| * | | Check that requested room_id existsAnant Prakash2017-04-141-1/+5
| | |/ | |/|
* | | Merge pull request #2160 from matrix-org/erikj/reduce_join_cache_sizeErik Johnston2017-04-261-2/+3
|\ \ \ | | | | | | | | Make state caches cache in ascii
| * | | Make state caches cache in asciiErik Johnston2017-04-251-2/+3
| | | |
* | | | document how to make IPv6 work (#2088)Matthew Hodgson2017-04-251-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | * document how to make IPv6 work * spell out that pip will install 17.1 by default
* | | | Merge pull request #2159 from matrix-org/erikj/reduce_join_cache_sizeErik Johnston2017-04-254-10/+42
|\| | | | | | | | | | | Reduce size of joined_user cache
| * | | fix upErik Johnston2017-04-251-1/+2
| | | |
| * | | Don't specify default as dictErik Johnston2017-04-251-1/+1
| | | |
| * | | CommentErik Johnston2017-04-251-0/+2
| | | |
| * | | Reduce size of joined_user cacheErik Johnston2017-04-254-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The _get_joined_users_from_context cache stores a mapping from user_id to avatar_url and display_name. Instead of storing those in a dict, store them in a namedtuple as that uses much less memory. We also try converting the string to ascii to further reduce the size.
* | | | Merge pull request #2149 from enckse/developErik Johnston2017-04-251-3/+2
|\ \ \ \ | |/ / / |/| | | setting up metrics, just adding/clarifying 2 very minor items
| * | | clarify metric setup to use 'scrape_configs' section of yaml and use an ↵Sean Enck2017-04-211-3/+2
| | | | | | | | | | | | | | | | array for target
* | | | Reduce _get_state_group_for_event cache sizeErik Johnston2017-04-251-1/+1
| | | |
* | | | Merge pull request #2158 from matrix-org/erikj/reduce_cache_sizeErik Johnston2017-04-253-24/+28
|\ \ \ \ | | | | | | | | | | Reduce cache size by not storing deferreds
| * | | | Remove DEBUG_CACHESErik Johnston2017-04-251-2/+0
| | | | |
| * | | | Reduce cache size by not storing deferredsErik Johnston2017-04-252-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the cache descriptors store deferreds rather than raw values, this is a simple way of triggering only one database hit and sharing the result if two callers attempt to get the same value. However, there are a few caches that simply store a mapping from string to string (or int). These caches can have a large number of entries, under the assumption that each entry is small. However, the size of a deferred (specifically the size of ObservableDeferred) is signigicantly larger than that of the raw value, 2kb vs 32b. This PR therefore changes the cache descriptors to store the raw values rather than the deferreds. As a side effect cached storage function now either return a deferred or the actual value, as the cached list decriptor already does. This is fine as we always end up just yield'ing on the returned value eventually, which handles that case correctly.
* | | | | Merge pull request #2156 from matrix-org/markjh/old_verify_keysMark Haines2017-04-251-3/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix code for reporting old verify keys in synapse
| * | | | | Fix code for reporting old verify keys in synapseMark Haines2017-04-241-3/+2
|/ / / / /
* | | | | Merge pull request #2145 from matrix-org/rav/reject_invite_to_unreachable_serverRichard van der Hoff2017-04-246-54/+130
|\ \ \ \ \ | |/ / / / |/| | | | Fix rejection of invites to unreachable servers
| * | | | Try harder when sending leave eventsRichard van der Hoff2017-04-211-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | When we're rejecting invites, ignore the backoff data, so that we have a better chance of not getting the room out of sync.
| * | | | Remove redundant try/except clausesRichard van der Hoff2017-04-211-23/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `except SynapseError` clauses were pointless because the wrapped functions would never throw a `SynapseError` (they either throw a `CodeMessageException` or a `RuntimeError`). The `except CodeMessageException` is now also pointless because the caller treats all exceptions equally, so we may as well just throw the `CodeMessageException`.
| * | | | Broaden the conditions for locally_rejecting invitesRichard van der Hoff2017-04-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic for marking invites as locally rejected was all well and good, but didn't happen when the remote server returned a 500, or wasn't reachable, or had no DNS, or whatever. Just expand the except clause to catch everything. Fixes https://github.com/matrix-org/synapse/issues/761.
| * | | | Remove redundant functionRichard van der Hoff2017-04-211-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | inline `reject_remote_invite`, which only existed to make tracing the callflow more difficult.
| * | | | Fix some lies, and other clarifications, in docstringsRichard van der Hoff2017-04-214-19/+88
| | | | | | | | | | | | | | | | | | | | | | | | | The documentation on get_json has been wrong ever since the very first commit to synapse...
* | | | | Merge pull request #2155 from matrix-org/erikj/string_internErik Johnston2017-04-241-18/+11
|\ \ \ \ \ | | | | | | | | | | | | Only intern ascii strings
| * | | | | Only intern ascii stringsErik Johnston2017-04-241-18/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #2154 from matrix-org/erikj/remove_unused_cacheErik Johnston2017-04-242-9/+1
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused cache
| * | | | Remove unused cacheErik Johnston2017-04-242-9/+1
|/ / / /
* / / / Document some of the admin APIs (#2143)Richard van der Hoff2017-04-211-0/+73
|/ / / | | | | | | | | | | | | | | | I haven't (yet) documented all of the user-list APIs introduced in https://github.com/matrix-org/synapse/pull/1784 because the API shape seems very odd, given the functionality.
* | | m.read_marker -> m.fully_read (#2128)Luke Barnard2017-04-183-9/+9
| | | | | | | | | | | | | | | | | | Also: - change the REST endpoint to have a "S" on the end (so it's now /read_markers) - change the content of the m.read_up_to event to have the key "event_id" instead of "marker".
* | | Merge pull request #2132 from feld/patch-1Matthew Hodgson2017-04-171-1/+1
|\ \ \ | |_|/ |/| | Update README.rst
| * | Update README.rstMark Felder2017-04-171-1/+1
| | | | | | | | | The FreeBSD port has been moved to the net-im category
* | | Merge pull request #2120 from matrix-org/luke/read-markersLuke Barnard2017-04-136-1/+167
|\ \ \ | |_|/ |/| | Implement Read Marker API
| * | Correct logic in is_event_afterLuke Barnard2017-04-131-1/+1
| | |
| * | Simplify is_event_after logicLuke Barnard2017-04-122-12/+6
| | |
| * | More null-guard changesLuke Barnard2017-04-121-4/+4
| | |
| * | Remove Unused ref to hsLuke Barnard2017-04-121-1/+0
| | |
| * | Move a spaceLuke Barnard2017-04-121-2/+2
| | |
| * | Only notify user, not entire roomLuke Barnard2017-04-121-3/+1
| | |
| * | Remove comment, simplify null-guardLuke Barnard2017-04-121-4/+1
| | |
| * | Handle no previous RMLuke Barnard2017-04-121-1/+4
| | |
| * | travis flake8..Luke Barnard2017-04-111-0/+1
| | |
| * | flake8Luke Barnard2017-04-111-1/+0
| | |
| * | Refactor event ordering check to events storeLuke Barnard2017-04-112-28/+32
| | |
| * | CopyrightLuke Barnard2017-04-111-1/+1
| | |
| * | flake8Luke Barnard2017-04-113-5/+4
| | |
| * | Finish implementing RM endpointLuke Barnard2017-04-115-48/+67
| | | | | | | | | | | | | | | - This change causes a 405 to be sent if "m.read_marker" is set via /account_data - This also fixes-up the RM endpoint so that it actually Works.
| * | Initial commit of RM server-side impllukebarnard2017-04-112-0/+153
| | | | | | | | | | | | (See https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit#heading=h.lndohpg8at5u)
* | | Merge pull request #2115 from matrix-org/erikj/dedupe_federation_replErik Johnston2017-04-127-130/+203
|\ \ \ | | | | | | | | Reduce federation replication traffic
| * | | CommentErik Johnston2017-04-121-2/+1
| | | |
| * | | Reuse get_interested_partiesErik Johnston2017-04-122-19/+8
| | | |
| * | | Move get_presence_list_* to SlaveStoreErik Johnston2017-04-113-24/+13
| | | |
| * | | CommentErik Johnston2017-04-112-1/+9
| | | |
| * | | Move get_interested_partiesErik Johnston2017-04-112-38/+36
| | | |
| * | | CommentsErik Johnston2017-04-112-9/+10
| | | |
| * | | Move get_interested_remotes back to presence handlerErik Johnston2017-04-112-38/+55
| | | |
| * | | CommentsErik Johnston2017-04-111-1/+14
| | | |
| * | | Reduce federation presence replication trafficErik Johnston2017-04-106-80/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly done by moving the calculation of where to send presence updates from the presence handler to the transaction queue, so we only need to send the presence event (and not the destinations) across the replication connection. Before we were duplicating by sending the full state across once per destination.
* | | | Merge pull request #2121 from matrix-org/paul/sent-transactions-metricPaul Evans2017-04-121-0/+3
|\ \ \ \ | | | | | | | | | | Add a counter metric for successfully-sent transactions
| * | | | Add a counter metric for successfully-sent transactionsPaul "LeoNerd" Evans2017-04-111-0/+3
| | | | |
* | | | | Merge pull request #2116 from matrix-org/erikj/dedupe_federation_repl2Erik Johnston2017-04-121-6/+24
|\ \ \ \ \ | | | | | | | | | | | | Dedupe KeyedEdu and Devices federation repl traffic
| * | | | | Add some commentsErik Johnston2017-04-121-0/+15
| | | | | |
| * | | | | Use generatorsErik Johnston2017-04-101-2/+2
| | | | | |
| * | | | | Dedupe KeyedEdu and Devices federation repl trafficErik Johnston2017-04-101-6/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #2117 from matrix-org/erikj/remove_http_replicationErik Johnston2017-04-128-990/+11
|\ \ \ \ \ | | | | | | | | | | | | Remove HTTP replication APIs
| * | | | | Remove last reference to worker_replication_urlErik Johnston2017-04-121-1/+2
| | | | | |
| * | | | | Update replication docsErik Johnston2017-04-111-22/+4
| | | | | |
| * | | | | Update workers docsErik Johnston2017-04-111-10/+5
| | | | | |
| * | | | | Remove test of replication resourceErik Johnston2017-04-111-204/+0
| | | | | |
| * | | | | Remove HTTP replication APIsErik Johnston2017-04-115-753/+0
| |/ / / /
* | | | | Merge pull request #2118 from matrix-org/erikj/no_devicesErik Johnston2017-04-121-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Fix getting latest device IP for user with no devices
| * | | | Bail on where clause insteadErik Johnston2017-04-111-3/+4
| | | | |
| * | | | Don't bother with outer check for nowErik Johnston2017-04-111-3/+0
| | | | |
| * | | | Fix getting latest device IP for user with no devicesErik Johnston2017-04-111-0/+5
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-04-113-5/+14
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse v0.20.0Erik Johnston2017-04-11100-1348/+3717
| |\ \
| | * | Bump changelog github/release-v0.20.0 release-v0.20.0Erik Johnston2017-04-111-1/+1
| | | |
| | * | Merge pull request #2110 from matrix-org/rav/fix_reject_persistenceRichard van der Hoff2017-04-071-4/+4
| | |\ \ | | | | | | | | | | When we do an invite rejection, save the signed leave event to the db
| | | * | When we do an invite rejection, save the signed leave event to the dbRichard van der Hoff2017-04-071-4/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a rejection of an invite received over federation, we ask a remote server to make us a `leave` event, then sign it, then send that with `send_leave`. We were saving the *unsigned* version of the event (which has a different event id to the signed version) to our db (and sending it to the clients), whereas other servers in the room will have seen the *signed* version. We're not aware of any actual problems that caused, except that it makes the database confusing to look at and generally leaves the room in a weird state.
| | * | Bump version and changelogErik Johnston2017-04-072-1/+10
| | | |
* | | | trust a hypothetical future riot.im ISMatthew Hodgson2017-04-101-0/+1
| |_|/ |/| |
* | | TypoErik Johnston2017-04-101-1/+1
| | |
* | | Merge pull request #2102 from DanielDent/add-auth-emailDavid Baker2017-04-102-1/+21
|\ \ \ | | | | | | | | Support authenticated SMTP
| * | | Support authenticated SMTPDaniel Dent2017-04-052-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Closes (SYN-714) #1385 Signed-off-by: Daniel Dent <matrixcontrib@contactdaniel.net>
* | | | Merge pull request #2109 from matrix-org/erikj/send_queue_fixErik Johnston2017-04-103-92/+245
|\ \ \ \ | | | | | | | | | | Fix up federation SendQueue and document types
| * | | | Rename variableErik Johnston2017-04-101-7/+7
| | | | |
| * | | | Revert to sending the same data type as beforeErik Johnston2017-04-101-2/+2
| | | | |
| * | | | Change nameErik Johnston2017-04-101-2/+2
| | | | |
| * | | | CommentsErik Johnston2017-04-102-6/+8
| | | | |
| * | | | CommentErik Johnston2017-04-071-2/+15
| | | | |
| * | | | Add loggingErik Johnston2017-04-071-0/+8
| | | | |
| * | | | Fix up federation SendQueue and document typesErik Johnston2017-04-072-91/+221
| | | | |
* | | | | Up replication ping timeoutErik Johnston2017-04-101-2/+4
| | | | |
* | | | | Merge pull request #2108 from matrix-org/erikj/current_state_idsErik Johnston2017-04-071-10/+26
|\ \ \ \ \ | |/ / / / |/| | | | Speed up get_current_state_ids
| * | | | CommentErik Johnston2017-04-071-0/+9
| | | | |
| * | | | Speed up get_current_state_idsErik Johnston2017-04-071-10/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using _simple_select_list is fairly expensive for functions that return a lot of rows and/or get called a lot. (This is because it carefully constructs a list of dicts). get_current_state_ids gets called a lot on startup and e.g. when the IRC bridge decided to send tonnes of joins/leaves (as it invalidates the cache). We therefore replace it with a custon txn function that builds up the final result dict without building up and intermediate representation.
* | | | Merge pull request #2107 from HarHarLinks/patch-1Erik Johnston2017-04-071-1/+1
|\ \ \ \ | | | | | | | | | | fix typo in synctl help
| * | | | fix typo in synctl helpKim Brose2017-04-061-1/+1
| | |/ / | |/| |
* | | | Merge pull request #2103 from matrix-org/erikj/no-double-encodeErik Johnston2017-04-075-47/+88
|\ \ \ \ | | | | | | | | | | Don't double encode replication data
| * | | | Document types of the replication streamsErik Johnston2017-04-061-28/+76
| | | | |
| * | | | Don't double json encode typing replication dataErik Johnston2017-04-052-6/+2
| | | | |
| * | | | Don't double json encode federation replication dataErik Johnston2017-04-052-13/+10
| | | | |
* | | | | Use iteritemsErik Johnston2017-04-061-2/+2
| | | | |
* | | | | Merge pull request #2106 from matrix-org/erikj/reduce_user_syncErik Johnston2017-04-061-4/+43
|\ \ \ \ \ | | | | | | | | | | | | Reduce rate of USER_SYNC repl commands
| * | | | | CommentErik Johnston2017-04-061-1/+1
| | | | | |
| * | | | | DocsErik Johnston2017-04-061-0/+7
| | | | | |
| * | | | | Don't immediately notify the master about users whose syncs have gone awayErik Johnston2017-04-051-4/+36
| |/ / / /
* | | | | Fix incorrect type when using InvalidateCacheCommandErik Johnston2017-04-061-1/+1
| | | | |
* | | | | Add log linesErik Johnston2017-04-051-1/+2
| | | | |
* | | | | Merge pull request #2104 from matrix-org/erikj/metrics_tcpErik Johnston2017-04-051-7/+38
|\ \ \ \ \ | |/ / / / |/| | | | Rearrange TCP replication metrics
| * | | | Rearrange metricsErik Johnston2017-04-052-19/+31
| | | | |
| * | | | Fix typoErik Johnston2017-04-051-2/+2
| | | | |
| * | | | Fixup some metrics for tcp replErik Johnston2017-04-052-0/+19
|/ / / /
* | | | Merge pull request #2097 from matrix-org/erikj/repl_tcp_clientErik Johnston2017-04-0521-582/+602
|\ \ \ \ | | | | | | | | | | Move to using TCP replication
| * | | | Add commentErik Johnston2017-04-041-0/+5
| | | | |
| * | | | Add the appropriate amount of preserve_fnErik Johnston2017-04-044-17/+19
| | | | |
| * | | | Remove unused worker config optionErik Johnston2017-04-041-1/+0
| | | | |
| * | | | Shuffle and comment synchrotron presenceErik Johnston2017-04-041-9/+11
| | | | |
| * | | | Move where we ack federationErik Johnston2017-04-041-7/+16
| | | | |
| * | | | Update all the workers and master to use TCP replicationErik Johnston2017-04-039-401/+259
| | | | |
| * | | | Change slave storage to use new replication interfaceErik Johnston2017-04-0311-179/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the TCP replication uses a slightly different API and streams than the HTTP replication. This breaks HTTP replication.
| * | | | Add basic replication client handler and factoryErik Johnston2017-04-031-0/+196
| | | | |
* | | | | Merge pull request #2099 from matrix-org/erikj/deviceinbox_reduceErik Johnston2017-04-051-4/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Deduplicate new deviceinbox rows for replication
| * | | | Deduplicate new deviceinbox rows for replicationErik Johnston2017-04-041-4/+7
|/ / / /
* | | | Merge pull request #2098 from matrix-org/erikj/repl_tcp_fixErik Johnston2017-04-043-6/+15
|\ \ \ \ | | | | | | | | | | Advance replication streams even if nothing is listening
| * | | | Advance replication streams even if nothing is listeningErik Johnston2017-04-043-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the streams don't advance and steadily fall behind, so when a worker does connect either a) they'll be streamed lots of old updates or b) the connection will fail as the streams are too far behind.
* | | | | Fiddle tcp replication loggingErik Johnston2017-04-041-2/+2
|/ / / /
* | | | Merge pull request #2082 from matrix-org/erikj/repl_tcp_serverErik Johnston2017-04-0415-20/+2156
|\ \ \ \ | | | | | | | | | | Replace HTTP replication with TCP replication (Server side part)
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-04-0428-180/+489
| |\ \ \ \ | |/ / / / |/| / / / | |/ / / erikj/repl_tcp_server
* | | | Merge pull request #2095 from matrix-org/rav/cull_log_preservesRichard van der Hoff2017-04-034-43/+31
|\ \ \ \ | | | | | | | | | | Cull spurious PreserveLoggingContexts
| * | | | Remove spurious yieldRichard van der Hoff2017-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | In `MessageHandler`, remove `yield` on call to `Notifier.on_new_room_event`: it doesn't return anything anyway.
| * | | | Remove more spurious `PreserveLoggingContext`sRichard van der Hoff2017-04-031-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`; there is no problem if the logcontext is set when calling it.
| * | | | Remove spurious PreserveLoggingContextRichard van der Hoff2017-04-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | In `on_new_room_event`, remove `PreserveLoggingContext` - we can call its subroutines with the logcontext set.
| * | | | preserve_fn some deferred-returning thingsRichard van der Hoff2017-04-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | In `Notifier._on_new_room_event`, `preserve_fn` around its subroutines which return deferreds, so that it is safe to call it with an active logcontext.
| * | | | Fix fixme in preserve_fnRichard van der Hoff2017-04-031-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | `preserve_fn` is no longer used as a decorator anywhere, so we can safely fix a fixme therein.
| * | | | Remove spurious @preserve_fn decoratorsRichard van der Hoff2017-04-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `@preserve_fn` decorators on `on_new_room_event`, `_notify_pending_new_room_events`, `_on_new_room_event`, `on_new_event`, and `on_new_replication_data` - none of these functions return a deferred, and the decorator does nothing unless the wrapped function returns a deferred, so the decorator was a no-op.
* | | | | Merge remote-tracking branch 'origin/release-v0.20.0' into developRichard van der Hoff2017-04-032-5/+19
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #2094 from matrix-org/rav/fix_federation_joinRichard van der Hoff2017-04-032-5/+19
| |\ \ \ \ | | | | | | | | | | | | Accept join events from all servers
| | * | | | Accept join events from all serversRichard van der Hoff2017-04-032-5/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we accept join events from any server, rather than just the origin server, to make the federation join dance work correctly. (Fixes #1893).
* | / / / Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into developErik Johnston2017-04-032-1/+45
|\| | | | | |/ / / |/| | |
| * | | Bump version and changelog v0.20.0-rc1Erik Johnston2017-03-302-1/+45
| | | |
* | | | Merge pull request #2078 from APwhitehat/assertuserfriendlyErik Johnston2017-03-311-1/+2
|\ \ \ \ | | | | | | | | | | add user friendly report of assertion error in synctl.py
| * | | | add user friendly report of assertion error in synctl.pyAnant Prakash2017-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Anant Prakash <anantprakashjsr@gmail.com>
* | | | | Merge pull request #1984 from RyanBreaker/patch-1Erik Johnston2017-03-311-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Add missing package to CentOS section
| * | | | | Add --upgrade pipRyan Breaker2017-03-131-0/+1
| | | | | | | | | | | | | | | | | | Needed before `pip instal --upgrade setuptools` for CentOS 7 and also doesn't hurt for any other distro.
| * | | | | Add missing package to CentOS sectionRyan Breaker2017-03-101-2/+2
| | | | | | | | | | | | | | | | | | Also added Fedora 25 to header as the same packages work for it as well.
* | | | | | Merge pull request #2011 from matrix-org/matthew/turn_allow_guestsErik Johnston2017-03-313-5/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | add setting (on by default) to support TURN for guests
| * | | | | | typoMatthew Hodgson2017-03-151-1/+1
| | | | | | |
| * | | | | | set default for turn_allow_guests correctlyMatthew Hodgson2017-03-151-1/+1
| | | | | | |
| * | | | | | add setting (on by default) to support TURN for guestsMatthew Hodgson2017-03-153-5/+46
| | | | | | |
* | | | | | | Merge pull request #1986 from matrix-org/matthew/enable_guest_3pErik Johnston2017-03-311-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | enable guest access for the 3pl/3pid APIs
| * | | | | | | switch to allow_guest=True for authing 3Ps as per PR feedbackMatthew Hodgson2017-03-311-0/+8
| | | | | | | |
| * | | | | | | enable guest access for the 3pl/3pid APIsMatthew Hodgson2017-03-121-8/+0
| | | | | | | |
* | | | | | | | Merge pull request #2024 from jerrykan/db_port_schemaErik Johnston2017-03-311-3/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't assume postgres tables are in the public schema during db port
| * | | | | | | | Don't assume postgres tables are in the public schema during db portJohn Kristensen2017-03-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching the list of tables from the postgres database during the db port, it is assumed that the tables are in the public schema. This is not always the case, so lets just rely on postgres to determine the default schema to use.
* | | | | | | | | Merge pull request #1961 from benhylau/patch-1Erik Johnston2017-03-311-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarify doc for SQLite to PostgreSQL port
| * | | | | | | | | Clarify doc for SQLite to PostgreSQL portBenedict Lau2017-03-011-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1927 from zuckschwerdt/fix-nuke-scriptErik Johnston2017-03-311-10/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | bring nuke-room script to current schema
| * | | | | | | | | bring nuke-room script to current schemaChristian W. Zuckschwerdt2017-02-191-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christian W. Zuckschwerdt <christian@zuckschwerdt.org>
* | | | | | | | | | Merge pull request #2075 from matrix-org/erikj/cache_speedErik Johnston2017-03-317-16/+87
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Speed up cached function access
| * | | | | | | | | | Remove unused instance variableErik Johnston2017-03-311-4/+0
| | | | | | | | | | |
| * | | | | | | | | | DocsErik Johnston2017-03-301-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Revert log context changeErik Johnston2017-03-301-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Doc new instance variablesErik Johnston2017-03-301-1/+8
| | | | | | | | | | |
| * | | | | | | | | | Fix up testsErik Johnston2017-03-303-2/+42
| | | | | | | | | | |
| * | | | | | | | | | Manually calculate cache key as getcallargs is expensiveErik Johnston2017-03-301-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because getcallargs recomputes the getargspec, amongst other things, which we don't need to do as its already been done
| * | | | | | | | | | Don't convert to deferreds when not necessaryErik Johnston2017-03-305-8/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #2076 from matrix-org/erikj/as_perfErik Johnston2017-03-312-19/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make AS's faster
| * | | | | | | | | | | Add commentErik Johnston2017-03-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Cache whether an AS is interested based on membersErik Johnston2017-03-281-1/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Remove param and cast at call siteErik Johnston2017-03-281-8/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Compile the regex's used in ASesErik Johnston2017-03-282-10/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2083 from matrix-org/erikj/copy_replace_speedErik Johnston2017-03-311-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Speed up copy_and_replace
| * | | | | | | | | | | Speed up copy_and_replaceErik Johnston2017-03-301-3/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2079 from matrix-org/erikj/push_regex_cacheErik Johnston2017-03-301-47/+57
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Cache glob to regex at a higher level for push
| * | | | | | | | | | Cache glob to regex at a higher level for pushErik Johnston2017-03-291-47/+57
| | | | | | | | | | |
* | | | | | | | | | | Fix the logcontext handling in the cache wrappers (#2077)Richard van der Hoff2017-03-304-19/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache wrappers had a habit of leaking the logcontext into the reactor while the lookup function was running, and then not restoring it correctly when the lookup function had completed. It's all the fault of `preserve_context_over_{fn,deferred}` which are basically a bit broken.
| | | | | | | | | * | Always advance stream tokensErik Johnston2017-04-031-1/+4
| | | | | | | | | | |
| | | | | | | | | * | Use callbacks to notify tcp replication rather than deferredsErik Johnston2017-03-312-20/+12
| | | | | | | | | | |
| | | | | | | | | * | Add a timestamp to USER_SYNC commandErik Johnston2017-03-314-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This timestamp is used to indicate when the user last sync'd
| | | | | | | | | * | Fix up presenceErik Johnston2017-03-311-1/+3
| | | | | | | | | | |
| | | | | | | | | * | Add a brief list of commands to docsErik Johnston2017-03-311-0/+46
| | | | | | | | | | |
| | | | | | | | | * | Fix up docsErik Johnston2017-03-314-28/+12
| | | | | | | | | | |
| | | | | | | | | * | Remove user from process_presence when stops syncingErik Johnston2017-03-301-0/+1
| | | | | | | | | | |
| | | | | | | | | * | Fix indentation in docs/Erik Johnston2017-03-301-25/+28
| | | | | | | | | | |
| | | | | | | | | * | Add tcp replication listener type and hook it upErik Johnston2017-03-301-0/+11
| | | | | | | | | | |
| | | | | | | | | * | Add functions to presence to support remote syncsErik Johnston2017-03-301-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TCP replication protocol streams deltas of who has started or stopped syncing. This is different from the HTTP API which periodically sends the full list of users who are syncing. This commit adds support for the new TCP style of sending deltas.
| | | | | | | | | * | Add server side resource for tcp replicationErik Johnston2017-03-301-0/+300
| | | | | | | | | | |
| | | | | | | | | * | Initial TCP protocol implementationErik Johnston2017-03-304-0/+1148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This defines the low level TCP replication protocol
| | | | | | | | | * | Define the various streams we will replicateErik Johnston2017-03-302-0/+423
| | | | | | | | | | |
| | | | | | | | | * | Make federation send queue take the current positionErik Johnston2017-03-302-16/+26
| | | | | | | | | | |
| | | | | | | | | * | Add a simple hook to wait for replication trafficErik Johnston2017-03-301-0/+6
| | | | | | | | | | |
| | | | | | | | | * | Add new storage functions for new replicationErik Johnston2017-03-305-4/+137
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new replication protocol will keep all the streams separate, rather than muxing multiple streams into one.
* | | | | | | | | | Use txn.fetchall() so we can reuse txnErik Johnston2017-03-301-1/+1
| | | | | | | | | |
* | | | | | | | | | synctl.py: wait for synapse to stop before restarting (#2020)Anant Prakash2017-03-291-4/+43
|/ / / / / / / / /
* | | | | | | / / Increase cache size for _get_state_group_for_eventErik Johnston2017-03-291-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #1849 from matrix-org/erikj/state_typoErik Johnston2017-03-291-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix bug where current_state_events renamed to current_state_ids
| * | | | | | | | Fix bug where current_state_events renamed to current_state_idsErik Johnston2017-01-231-3/+3
| | | | | | | | |
* | | | | | | | | Bail early if remote wouldn't be retried (#2064)Erik Johnston2017-03-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bail early if remote wouldn't be retried * Don't always return true * Just use get_retry_limiter * Spelling
* | | | | | | | | Merge pull request #2053 from matrix-org/erikj/e2e_one_time_upsertErik Johnston2017-03-291-9/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't user upsert to persist new one time keys
| * | | | | | | | | Decrank last commitErik Johnston2017-03-291-4/+5
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-03-2945-593/+828
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/e2e_one_time_upsert
| * | | | | | | | | | Correctly look up keyErik Johnston2017-03-291-6/+5
| | | | | | | | | | |
| * | | | | | | | | | The algorithm is part of the key idErik Johnston2017-03-281-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Raise a more helpful exceptionErik Johnston2017-03-231-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Don't user upsert to persist new one time keysErik Johnston2017-03-231-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we no-op duplicate one time key uploads, an error if the key_id already exists but encodes a different key.
* | | | | | | | | | | Merge pull request #2067 from matrix-org/erikj/notify_on_fedErik Johnston2017-03-291-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Notify on new federation traffic
| * | | | | | | | | | Notify on new federation trafficErik Johnston2017-03-271-0/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #2037 from ricco386/fix_readme_centos_issuesRichard van der Hoff2017-03-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix installation issues
| * | | | | | | | | | | Removed requirement that is not neededRichard Kellner2017-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have removed libsodium from CentOS system requirements, as it is part PyNaCl. Signed-off-by: Richard Kellner <richard.kellner@gmail.com>
| * | | | | | | | | | | Updated user creation sectionRichard Kellner2017-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | register_new_matrix_user command has one more question, I have updated the documentation to match the reality.
| * | | | | | | | | | | Added missing system requiremnt and pip upgrade before installRichard Kellner2017-03-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing on CentOS7 I wans't able to follow README instructions to install due to errors. I was missing libsodium in order to compile python dependencies. Default version of Python pip is really old and therefore setuptools upgrade ended with error as well. In order to be able to continue I needed to upgrade pip as well.
* | | | | | | | | | | | Merge pull request #2063 from matrix-org/erikj/device_list_batchErik Johnston2017-03-282-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | Batch sending of device list pokes
| * | | | | | | | | | | Batch sending of device list pokesErik Johnston2017-03-242-0/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2070 from matrix-org/erikj/perf_sendErik Johnston2017-03-271-36/+51
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Short circuit if all new events have same state group
| * | | | | | | | | | TypoErik Johnston2017-03-271-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Short circuit if all new events have same state groupErik Johnston2017-03-271-36/+51
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2062 from matrix-org/erikj/presence_replicationErik Johnston2017-03-242-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use presence replication stream to invalidate cache
| * | | | | | | | | | Actually call invalidateErik Johnston2017-03-241-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use presence replication stream to invalidate cacheErik Johnston2017-03-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the cache invalidation replication stream to invalidate the _get_presence_cache, we can instead rely on the presence replication stream. This reduces the amount of replication traffic considerably.
* | | | | | | | | | | Merge pull request #2061 from matrix-org/erikj/add_transaction_storeErik Johnston2017-03-242-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add slave transaction store to workers who send federation requests
| * | | | | | | | | | Add slave transaction storeErik Johnston2017-03-242-0/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #2060 from matrix-org/erikj/cache_hosts_in_roomErik Johnston2017-03-242-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache hosts in room
| * | | | | | | | | | | Cache hosts in roomErik Johnston2017-03-242-2/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2058 from matrix-org/rav/logcontext_leaks_2Richard van der Hoff2017-03-241-12/+16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | try not to drop context after federation requests
| * | | | | | | | | | | try not to drop context after federation requestsRichard van der Hoff2017-03-231-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve_context_over_fn uses a ContextPreservingDeferred, which only restores context for the duration of its callbacks, which isn't really correct, and means that subsequent operations in the same request can end up without their logcontexts.
* | | | | | | | | | | | Merge pull request #2057 from matrix-org/rav/missing_yield_2Richard van der Hoff2017-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Add another missing yield on check_device_registered
| * | | | | | | | | | | Add another missing yield on check_device_registeredRichard van der Hoff2017-03-231-1/+1
| | | | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 13:13:40 +0000