Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | expose SlavedProfileStore to ClientReaderSlavedStore (#5200) | Neil Johnson | 2019-05-17 | 1 | -0/+2 |
| | | | * expose SlavedProfileStore to ClientReaderSlavedStore | ||||
* | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns | Erik Johnston | 2019-05-08 | 1 | -1/+82 |
|\ | | | | | Limit in flight DNS requests | ||||
| * | Limit in flight DNS requests | Erik Johnston | 2019-04-09 | 1 | -1/+82 |
| | | | | | | | | | | | | | | This is to work around a bug in twisted where a large number of concurrent DNS requests cause it to tight loop forever. c.f. https://twistedmatrix.com/trac/ticket/9620#ticket | ||||
* | | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 1 | -1/+1 |
| | | | | | | | | It doesn't really belong under rest/client/v1 any more. | ||||
* | | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 1 | -0/+2 |
| | | |||||
* | | VersionRestServlet doesn't take a param | Erik Johnston | 2019-04-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5063 from matrix-org/erikj/move_endpoints | Erik Johnston | 2019-04-15 | 1 | -4/+7 |
|\ \ | |/ |/| | Move some rest endpoints to client reader | ||||
| * | Move some rest endpoints to client reader | Erik Johnston | 2019-04-15 | 1 | -4/+7 |
| | | |||||
* | | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 1 | -1/+1 |
|/ | | | | add context to phonehome stats | ||||
* | Combine the CurrentStateDeltaStream into the EventStream | Richard van der Hoff | 2019-03-27 | 1 | -7/+10 |
| | |||||
* | Make EventStream rows have a type | Richard van der Hoff | 2019-03-27 | 1 | -1/+4 |
| | | | | ... as a precursor to combining it with the CurrentStateDelta stream. | ||||
* | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 1 | -0/+30 |
|\ | | | | | Move client receipt processing to federation sender worker. | ||||
| * | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 1 | -0/+30 |
| | | | | | | | | | | This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can". | ||||
* | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ci | Erik Johnston | 2019-03-15 | 2 | -15/+19 |
|\ \ | | | | | | | Allow passing --daemonize to workers | ||||
| * | | Correctly handle all command line options | Erik Johnston | 2019-03-14 | 2 | -15/+19 |
| |/ | |||||
* / | master startup | Amber Brown | 2019-03-11 | 1 | -0/+1 |
|/ | |||||
* | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 1 | -0/+11 |
| | |||||
* | Merge pull request #4759 from matrix-org/erikj/3pid_client_reader | Erik Johnston | 2019-02-27 | 1 | -0/+2 |
|\ | | | | | Move /account/3pid to client_reader | ||||
| * | Move /account/3pid to client_reader | Erik Johnston | 2019-02-27 | 1 | -0/+2 |
| | | |||||
* | | Move server key queries to federation reader | Erik Johnston | 2019-02-27 | 1 | -1/+5 |
|/ | |||||
* | Add database version to phonehome stats. (#4753) | Richard van der Hoff | 2019-02-27 | 1 | -0/+3 |
| | |||||
* | Correctly proxy exception in frontend_proxy worker | Erik Johnston | 2019-02-23 | 1 | -5/+10 |
| | |||||
* | Merge pull request #4670 from matrix-org/erikj/register_login_split | Erik Johnston | 2019-02-19 | 1 | -0/+2 |
|\ | | | | | Split /login into client_reader | ||||
| * | Split /login into client_reader | Erik Johnston | 2019-02-18 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #4632 from matrix-org/erikj/basic_sentry | Erik Johnston | 2019-02-18 | 1 | -0/+30 |
|\ \ | | | | | | | Add basic optional sentry.io integration | ||||
| * | | Fixup comments and add warning | Erik Johnston | 2019-02-13 | 1 | -3/+3 |
| | | | |||||
| * | | Comments | Erik Johnston | 2019-02-12 | 1 | -0/+8 |
| | | | |||||
| * | | Basic sentry integration | Erik Johnston | 2019-02-12 | 1 | -0/+22 |
| | | | |||||
* | | | Merge pull request #4666 from matrix-org/erikj/register_login_split | Erik Johnston | 2019-02-18 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | Split out registration to worker | ||||
| * | | Split out registration to worker | Erik Johnston | 2019-02-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows registration to be handled by a worker, though the actual write to the database still happens on master. Note: due to the in-memory session map all registration requests must be handled by the same worker. | ||||
* | | | Fix kicking guest users in worker mode | Erik Johnston | 2019-02-18 | 1 | -0/+2 |
|/ / | | | | | | | | | | | | | | | When guest_access changes from allowed to forbidden all local guest users should be kicked from the room. This did not happen when revocation was received from federation on a worker. Presumably broken in #4141 | ||||
* | | Fix errors in acme provisioning (#4648) | Richard van der Hoff | 2019-02-14 | 1 | -6/+13 |
| | | | | | | | | | | | | | | | | | | * Better logging for errors on startup * Fix "TypeError: '>' not supported" when starting without an existing certificate * Fix a bug where an existing certificate would be reprovisoned every day | ||||
* | | Update synapse/app/_base.py | Erik Johnston | 2019-02-13 | 1 | -1/+1 |
| | | | | | | Co-Authored-By: richvdh <1389908+richvdh@users.noreply.github.com> | ||||
* | | Use `listen_tcp` for the replication listener | Richard van der Hoff | 2019-02-13 | 1 | -7/+7 |
| | | | | | | | | | | Fixes the "can't listen on 0.0.0.0" error. Also makes it more consistent with what we do elsewhere. | ||||
* | | Improve logging around listening services | Richard van der Hoff | 2019-02-13 | 2 | -11/+20 |
| | | | | | | | | | | | | | | | | | | I wanted to bring listen_tcp into line with listen_ssl in terms of returning a list of ports, and wanted to check that was a safe thing to do - hence the logging in `refresh_certificate`. Also, pull the 'Synapse now listening' message up to homeserver.py, because it was being duplicated everywhere else. | ||||
* | | Special-case the default bind_addresses for metrics listener | Richard van der Hoff | 2019-02-13 | 1 | -3/+2 |
|/ | | | | | turns out it doesn't really support ipv6, so let's hack around that by only listening on ipv4 by default. | ||||
* | Fix error when loading cert if tls is disabled (#4618) | Richard van der Hoff | 2019-02-12 | 1 | -2/+3 |
| | | | | | | If TLS is disabled, it should not be an error if no cert is given. Fixes #4554. | ||||
* | Infer no_tls from presence of TLS listeners | Richard van der Hoff | 2019-02-11 | 2 | -6/+1 |
| | | | | | Rather than have to specify `no_tls` explicitly, infer whether we need to load the TLS keys etc from whether we have any TLS-enabled listeners. | ||||
* | Don't create server contexts when TLS is disabled | Richard van der Hoff | 2019-02-11 | 1 | -0/+5 |
| | | | | we aren't going to use them anyway. | ||||
* | Logging improvements around TLS certs | Richard van der Hoff | 2019-02-11 | 1 | -4/+2 |
| | | | | | Log which file we're reading keys and certs from, and refactor the code a bit in preparation for other work | ||||
* | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) | Richard van der Hoff | 2019-02-11 | 1 | -3/+0 |
| | | | | | It's nothing to do with refreshing the certificates. No idea why it was here. | ||||
* | ACME Reprovisioning (#4522) | Amber Brown | 2019-02-11 | 2 | -24/+74 |
| | |||||
* | Merge pull request #4420 from matrix-org/jaywink/openid-listener | Erik Johnston | 2019-02-11 | 2 | -2/+24 |
|\ | | | | | New listener resource for the federation API "openid/userinfo" endpoint | ||||
| * | Fix flake8 issues | Jason Robinson | 2019-01-23 | 1 | -1/+4 |
| | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Split federation OpenID userinfo endpoint out of the federation resource | Jason Robinson | 2019-01-23 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the OpenID userinfo endpoint to be active even if the federation resource is not active. The OpenID userinfo endpoint is called by integration managers to verify user actions using the client API OpenID access token. Without this verification, the integration manager cannot know that the access token is valid. The OpenID userinfo endpoint will be loaded in the case that either "federation" or "openid" resource is defined. The new "openid" resource is defaulted to active in default configuration. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Make SynapseHomeServer _http_listener use self.get_reactor() | Jason Robinson | 2019-01-23 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | For all the homeserver classes, only the FrontendProxyServer passes its reactor when doing the http listen. Looking at previous PR's looks like this was introduced to make it possible to write a test, otherwise when you try to run a test with the test homeserver it tries to do a real bind to a port. Passing the reactor that the homeserver is instantiated with should probably be the right thing to do anyway? Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Make FederationReaderServer _http_listen use self.get_reactor() | Jason Robinson | 2019-01-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | For all the homeserver classes, only the FrontendProxyServer passes its reactor when doing the http listen. Looking at previous PR's looks like this was introduced to make it possible to write a test, otherwise when you try to run a test with the test homeserver it tries to do a real bind to a port. Passing the reactor that the homeserver is instantiated with should probably be the right thing to do anyway? Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | Deduplicate some code in synapse.app (#4567) | Amber Brown | 2019-02-08 | 12 | -147/+77 |
| | | |||||
* | | ACME config cleanups (#4525) | Richard van der Hoff | 2019-01-30 | 2 | -22/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Handle listening for ACME requests on IPv6 addresses the weird url-but-not-actually-a-url-string doesn't handle IPv6 addresses without extra quoting. Building a string which you are about to parse again seems like a weird choice. Let's just use listenTCP, which is consistent with what we do elsewhere. * Clean up the default ACME config make it look a bit more consistent with everything else, and tweak the defaults to listen on port 80. * newsfile | ||||
* | | Raise ConfigError instead | Erik Johnston | 2019-01-30 | 1 | -1/+3 |
| | | |||||
* | | _listener_http should return a list | Erik Johnston | 2019-01-30 | 1 | -1/+1 |
| | | |||||
* | | SIGHUP for TLS cert reloading (#4495) | Amber Brown | 2019-01-30 | 2 | -12/+68 |
| | | |||||
* | | Fix worker TLS (#4492) | Amber Brown | 2019-01-28 | 7 | -48/+48 |
| | | | | | | | | | | | | | | | | * load cert * changelog * fix | ||||
* | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 1 | -9/+47 |
|/ | |||||
* | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 1 | -8/+1 |
| | | | | | | | | * Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog | ||||
* | Make the dependencies more like a standard Python project and hook up the ↵ | Amber Brown | 2018-12-22 | 2 | -6/+3 |
| | | | | optional dependencies to setuptools (#4298) | ||||
* | ensure can report mau stats when hs.config.mau_stats_only is set (#4305) | Neil Johnson | 2018-12-18 | 1 | -1/+1 |
| | | | * ensure can report mau stats when hs.config.mau_stats_only is set | ||||
* | Merge branch 'release-v0.34.0' into develop | Richard van der Hoff | 2018-12-11 | 1 | -32/+14 |
|\ | |||||
| * | Merge pull request #4290 from matrix-org/rav/remove_webclient | Richard van der Hoff | 2018-12-11 | 1 | -32/+11 |
| |\ | | | | | | | Stop installing Matrix Console by default | ||||
| | * | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 1 | -32/+11 |
| | | | | | | | | | | | | This is based on the work done by @krombel in #2601. | ||||
| * | | Add a welcome page to the static resources | Richard van der Hoff | 2018-12-11 | 1 | -0/+3 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601. | ||||
* | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader. | ||||
* | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+2 |
|/ | | | | Sometimes it's useful for synapse to generate its own .well-known file. | ||||
* | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
| | |||||
* | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 1 | -0/+14 |
| | |||||
* | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 1 | -6/+1 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 1 | -3/+3 |
|\ | |||||
| * | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 1 | -3/+3 |
| |\ | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| | * | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough. | ||||
| | * | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This is public (or at least, called from outside the class), so ought to have a better name. | ||||
* | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 1 | -8/+0 |
|/ / | |||||
* | | 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 | ||||
| * | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -8/+22 |
| |/ | | | | | | | Fixes #3820 | ||||
* | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 1 | -7/+4 |
|\ \ | | | | | | | Make psutil an explicit dependency | ||||
| * | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 1 | -7/+4 |
| |/ | | | | | | | | | | | | | | | As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062. | ||||
* / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵ | Amber Brown | 2018-10-20 | 1 | -1/+1 |
|/ | | | | on py3) (#4068) | ||||
* | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 1 | -2/+2 |
| | |||||
* | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 4 | -28/+32 |
| | |||||
* | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 1 | -1/+0 |
| | | | | | I think this got forgotten in #3932. We were getting away with it because it was the last call in this function. | ||||
* | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 12 | -13/+13 |
| | | | | Signed-off-by: Schnuffle <schnuffle@github.com> | ||||
* | 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 | ||||
| * | Move synctl into top dir to avoid a symlink | Richard van der Hoff | 2018-09-25 | 1 | -284/+0 |
| | | | | | | | | | | | | symlinks apparently break setuptools on python3 and alpine (https://bugs.python.org/issue31940), so let's stop using a symlink and just use the file directly. | ||||
* | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 11 | -11/+0 |
|/ | | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead. | ||||
* | 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 |
| | |||||
* | improve naming | Neil Johnson | 2018-09-12 | 1 | -5/+9 |
| | |||||
* | expose number of real reserved users | Neil Johnson | 2018-09-12 | 1 | -3/+7 |
| | |||||
* | Make sure that we close db connections opened during init | Richard van der Hoff | 2018-08-28 | 11 | -46/+18 |
| | | | | | | | | | We should explicitly close any db connections we open, because failing to do so can block other transactions as per https://github.com/matrix-org/synapse/issues/3682. Let's also try to factor out some of the boilerplate by having server classes define their datastore class rather than duplicating the whole of `setup`. | ||||
* | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 1 | -0/+12 |
|\ | | | | | Allow profile updates to happen on workers | ||||
| * | Add some fixmes | Erik Johnston | 2018-08-17 | 1 | -0/+2 |
| | | |||||
| * | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse. | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 8 | -14/+43 |
| |\ | | | | | | | | | | erikj/split_profiles | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 1 | -1/+10 |
| |\ \ | | | | | | | | | | | | | erikj/split_profiles | ||||
| * | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands | Richard van der Hoff | 2018-08-17 | 5 | -5/+10 |
|\ \ \ \ | | | | | | | | | | | Logcontexts for replication command handlers | ||||
| * | | | | Logcontexts for replication command handlers | Richard van der Hoff | 2018-08-17 | 5 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky. | ||||
* | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix logcontexts for running pushers | ||||
| * | | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts. | ||||
* | | | / | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 3 | -8/+53 |
| |_|_|/ |/| | | | |||||
* | | | | remove errant yield | Neil Johnson | 2018-08-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
|/ / / | |||||
* | | | Fix inbound federation on reader worker | Erik Johnston | 2018-08-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data. | ||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 8 | -4/+20 |
|\ \ \ | | | | | | | | | | | | | erikj/split_federation | ||||
| * | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 |
| | | | | |||||
| * | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 8 | -0/+16 |
| |\ \ \ | | |_|/ | |/| | | send SNI for federation requests | ||||
| | * | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 4 | -11/+33 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 14 | -50/+71 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| | * | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 8 | -0/+16 |
| | | | | | | |||||
* | | | | | | Rename slave TransactionStore to SlaveTransactionStore | Erik Johnston | 2018-08-15 | 5 | -10/+10 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 1 | -1/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| * | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | update generate_monthly_active_users, and reap_monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 1 | -0/+19 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 1 | -0/+8 |
| |/ / / |/| | | | |||||
* | | | | count_monthly_users is now async | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| | | | | |||||
* | | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 1 | -4/+0 |
| | | | | |||||
* | | | | only need to loop if mau limiting is enabled | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| | | | | |||||
* | | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+5 |
| | | | | |||||
* | | | | remove errant logging | Neil Johnson | 2018-07-30 | 1 | -1/+0 |
| | | | | |||||
* | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 1 | -1/+19 |
|/ / / | |||||
* | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call. | ||||
* | | | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | This will reduce the number of "Starting db connection from sentinel context" warnings, and will help with our metrics. | ||||
* | | | Replace usage of get_current_toke with StreamToken.START | Erik Johnston | 2018-07-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows us to handle /context/ requests on the client_reader worker without having to pull in all the various stream handlers (e.g. precence, typing, pushers etc). The only thing the token gets used for is pagination, and that ignores everything but the room portion of the token. | ||||
* | | | Pull out did_forget to worker store | Erik Johnston | 2018-07-24 | 1 | -4/+1 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 2 | -3/+7 |
|\ \ \ | | | | | | | | | | | | | erikj/client_apis_move | ||||
| * | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 2 | -3/+7 |
| | |/ | |/| | |||||
* / | | Add some room read only APIs to client_reader | Erik Johnston | 2018-07-18 | 1 | -1/+13 |
|/ / | |||||
* / | run isort | Amber Brown | 2018-07-09 | 14 | -50/+71 |
|/ | |||||
* | Write a clear restart indicator in logs | Richard van der Hoff | 2018-06-20 | 1 | -6/+1 |
| | | | | | I'm fed up with never being able to find the point a server restarted in the logs. | ||||
* | Merge pull request #3389 from turt2live/travis/name_metrics | Amber Brown | 2018-06-13 | 11 | -11/+11 |
|\ | | | | | Use the correct flag (enable_metrics) when warning about an incorrect metrics setup | ||||
| * | The flag is named enable_metrics, not collect_metrics | Travis Ralston | 2018-06-12 | 11 | -11/+11 |
| | | | | | | Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
* | | Use the RegistryProxy for appservices too | Travis Ralston | 2018-06-12 | 1 | -1/+2 |
|/ | | | Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
* | Add hacky cache factor override system | Erik Johnston | 2018-06-04 | 1 | -0/+4 |
| | |||||
* | Merge pull request #3264 from matrix-org/neil/sign-up-stats | Neil Johnson | 2018-06-01 | 1 | -0/+4 |
|\ | | | | | daily user type phone home stats | ||||
| * | daily user type phone home stats | Neil Johnson | 2018-05-22 | 1 | -0/+4 |
| | | |||||
* | | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 12 | -14/+110 |
| | | |||||
* | | fixes | Amber Brown | 2018-05-22 | 1 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 1 | -0/+17 |
|\| | |||||
| * | Fix dependency on jinja2 | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Delay the import of ConsentResource, so that we can get away without jinja2 if people don't have the consent resource enabled. Fixes #3259 | ||||
| * | Merge pull request #3163 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-16 | 1 | -0/+8 |
| |\ | | | | | | | user visit data | ||||
| | * | remove unused method recurring_user_daily_visit_stats | Neil Johnson | 2018-05-16 | 1 | -3/+0 |
| | | | |||||
| | * | pep8 | Neil Johnson | 2018-05-15 | 1 | -1/+0 |
| | | | |||||
| | * | Limit query load of generate_user_daily_visits | Neil Johnson | 2018-05-15 | 1 | -14/+7 |
| | | | | | | | | | | | | The aim is to keep track of when it was last called and only query from that point in time | ||||
| | * | instead of inserting user daily visit data at the end of the day, instead ↵ | Neil Johnson | 2018-05-14 | 1 | -3/+16 |
| | | | | | | | | | | | | insert incrementally through the day | ||||
| | * | Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵ | Neil Johnson | 2018-05-14 | 11 | -87/+119 |
| | |\ | | | | | | | | | | | | | cohort_analytics | ||||
| | * | | 10 mins seems more reasonable that every minute | Neil Johnson | 2018-05-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Generate user daily stats | Neil Johnson | 2018-04-25 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 1 | -0/+9 |
| |\ \ \ | | |_|/ | |/| | | ConsentResource to gather policy consent from users | ||||
| | * | | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | Hopefully there are enough comments and docs in this that it makes sense on its own. | ||||
* | | | | look at the Prometheus metrics instead | Amber Brown | 2018-05-21 | 1 | -5/+3 |
|/ / / | |||||
* / / | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 11 | -0/+12 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | (instead of everywhere that writes a response. Or rather, the subset of places which write responses where we haven't forgotten it). This also means that we don't have to have the mysterious version_string attribute in anything with a request handler. Unfortunately it does mean that we have to pass the version string wherever we instantiate a SynapseSite, which has been c&ped 150 times, but that is code that ought to be cleaned up anyway really. | ||||
* | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 5 | -80/+101 |
|\ \ | |||||
| * | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 5 | -80/+101 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
* / | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 3 | -7/+6 |
|/ | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
* | Use six.itervalues in some places | Adrian Tschira | 2018-04-15 | 1 | -1/+3 |
| | | | | | | There's more where that came from Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 1 | -1/+1 |
|\ | | | | | Add b prefixes to some strings that are bytes in py3 | ||||
| * | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | more verbosity in synctl | Richard van der Hoff | 2018-04-06 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3041 from matrix-org/r30_stats | Neil Johnson | 2018-04-05 | 1 | -0/+4 |
|\ \ | | | | | | | R30 stats | ||||
| * | | Review comments | Neil Johnson | 2018-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Use iteritems over item to loop over dict formatting | ||||
| * | | Support multi client R30 for psql | Neil Johnson | 2018-03-28 | 1 | -1/+3 |
| | | | |||||
| * | | rename stat to future proof | Neil Johnson | 2018-03-28 | 1 | -1/+1 |
| | | | |||||
| * | | query and call for r30 stats | Neil Johnson | 2018-03-28 | 1 | -0/+2 |
| |/ | |||||
* | | phone home cache size configurations | Jan Christian Grünhage | 2018-04-04 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #3000 from NotAFile/change-except-style | Richard van der Hoff | 2018-04-04 | 1 | -2/+2 |
|\ \ | | | | | | | Replace old style error catching with 'as' keyword | ||||
| * | | replace old style error catching with 'as' keyword | NotAFile | 2018-03-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | This is both easier to read and compatible with python3 (not that that matters) Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | | Handle review comments | Michael Kaye | 2018-03-28 | 1 | -6/+9 |
| | | | |||||
* | | | As daemonizing will make a new process, defer call to init. | Michael Kaye | 2018-03-28 | 1 | -13/+23 |
| | | | |||||
* | | | Include coarse CPU and Memory use in stats callbacks. | Michael Kaye | 2018-03-27 | 1 | -0/+20 |
| |/ |/| | | | | | | | This requires the psutil module, and is still opt-in based on the report_stats config option. | ||||
* | | 404 correctly on missing paths via NoResource | Matthew Hodgson | 2018-03-23 | 11 | -22/+22 |
|/ | | | | fixes https://github.com/matrix-org/synapse/issues/2043 and https://github.com/matrix-org/synapse/issues/2029 | ||||
* | Register membership/state servlets in event_creator | Erik Johnston | 2018-03-14 | 1 | -1/+13 |
| | |||||
* | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
|\ | | | | | Remove ReplicationLayer and user Client/Server directly | ||||
| * | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | | |||||
* | | Don't build handlers on workers unnecessarily | Erik Johnston | 2018-03-13 | 5 | -5/+0 |
|/ | |||||
* | Split replication layer into two | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | |||||
* | Calculate push actions on worker | Erik Johnston | 2018-02-28 | 1 | -0/+8 |
| | |||||
* | Move storage functions for push calculations | Erik Johnston | 2018-02-27 | 2 | -11/+2 |
| | | | | This will allow push actions for an event to be calculated on workers. | ||||
* | Add event_creator worker | Erik Johnston | 2018-02-07 | 1 | -0/+170 |
| | |||||
* | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 1 | -0/+4 |
| | |||||
* | Factor out get_db_conn to HomeServer base class | Richard van der Hoff | 2018-01-26 | 10 | -130/+0 |
| | | | | | This function is identical to all subclasses, so we may as well push it up to the base class to reduce duplication (and make use of it in the tests) | ||||
* | Actually make it work | Erik Johnston | 2018-01-12 | 1 | -2/+10 |
| | |||||
* | Refactor | Erik Johnston | 2018-01-12 | 1 | -9/+4 |
| | |||||
* | When using synctl with workers, don't start the main synapse automatically | Erik Johnston | 2018-01-11 | 1 | -8/+26 |
| | |||||
* | Implement listen_tcp method in remaining workers | Silke | 2017-12-18 | 10 | -192/+155 |
| | | | | Signed-off-by: Silke <silke@slxh.eu> | ||||
* | Remove logger argument and do not catch replication listener | Silke | 2017-12-18 | 2 | -24/+18 |
| | | | | Signed-off-by: Silke <silke@slxh.eu> | ||||
* | Add methods for listening on multiple addresses | Silke Hofstra | 2017-12-17 | 2 | -51/+90 |
| | | | | | | | Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
* | Allow binds to both :: and 0.0.0.0 | Silke Hofstra | 2017-12-17 | 1 | -37/+58 |
| | | | | | | | | | | Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See #2232 Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
* | Add a comment which might save some confusion | Richard van der Hoff | 2017-11-24 | 1 | -0/+1 |
| | |||||
* | Remove dead sync_callback | Richard van der Hoff | 2017-11-24 | 1 | -2/+0 |
| | | | | This is never used; let's remove it to stop confusing things. | ||||
* | Add config option to disable media_repo on main synapse | Richard van der Hoff | 2017-11-22 | 2 | -8/+20 |
| | | | | ... to stop us doing the cache cleanup jobs on the master. | ||||
* | Build MediaRepositoryResource as a homeserver dependency | Richard van der Hoff | 2017-11-22 | 2 | -4/+2 |
| | | | | | | This avoids the scenario where we have four different PreviewUrlResources configured on a single app, each of which have their own caches and cache clearing jobs. | ||||
* | Merge pull request #2627 from matrix-org/rav/custom_rest_endpoints | David Baker | 2017-11-02 | 1 | -0/+12 |
|\ | | | | | Add a hook for custom rest endpoints | ||||
| * | Add a hook for custom rest endpoints | Richard van der Hoff | 2017-11-02 | 1 | -0/+12 |
| | | | | | | | | | | Let the user specify custom modules which can be used for implementing extra endpoints. | ||||
* | | Factor out _configure_named_resource | Richard van der Hoff | 2017-11-02 | 1 | -46/+64 |
|/ | | | | This was a bit of a code vomit, so let's factor it out to preserve some sanity | ||||
* | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header | Richard van der Hoff | 2017-10-27 | 1 | -0/+7 |
|\ | | | | | Front-end proxy: pass through auth header | ||||
| * | Front-end proxy: pass through auth header | Richard van der Hoff | 2017-10-26 | 1 | -0/+7 |
| | | | | | | | | So that access-token-in-an-auth-header works. | ||||
* | | Support /keys/upload on /r0 as well as /unstable | Richard van der Hoff | 2017-10-26 | 1 | -2/+1 |
|/ | | | | (So that we can stop riot relying on it in /unstable) | ||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -1/+1 |
| | | | | what could possibly go wrong | ||||
* | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 1 | -0/+6 |
|\ | | | | | Initial Group Implementation | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 11 | -465/+257 |
| |\ | |||||
| * | | Fix replication. And notify | Erik Johnston | 2017-07-20 | 1 | -0/+6 |
| | | | |||||
* | | | Make 'affinity' package optional | Erik Johnston | 2017-10-02 | 1 | -1/+14 |
| | | | |||||
* | | | Move quit_with_error | Erik Johnston | 2017-10-02 | 2 | -10/+11 |
| |/ |/| | |||||
* | | Fix user_dir startup | Richard van der Hoff | 2017-08-16 | 1 | -1/+1 |
| | | | | | | | | Add missing parameter to _base.start_worker_reactor | ||||
* | | Allow configuration of CPU affinity | Richard van der Hoff | 2017-08-15 | 2 | -1/+9 |
| | | | | | | | | | | Make it possible to set the CPU affinity in the config file, so that we don't need to remember to do it manually every time. | ||||
* | | Factor out common application start | Richard van der Hoff | 2017-08-15 | 11 | -464/+248 |
|/ | | | | | We have 10 copies of this code, and I don't really want to update each one separately. | ||||
* | Include registration and as stores in frontend proxy | Erik Johnston | 2017-07-07 | 1 | -0/+4 |
| | |||||
* | Add a frontend proxy | Erik Johnston | 2017-07-07 | 1 | -0/+267 |
| | |||||
* | Make workers report to master for user ip updates | Erik Johnston | 2017-06-27 | 4 | -8/+8 |
| | |||||
* | Fix for workers | Erik Johnston | 2017-06-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2286 from matrix-org/erikj/split_out_user_dir | Erik Johnston | 2017-06-16 | 2 | -1/+271 |
|\ | | | | | Split out user directory to a separate process | ||||
| * | Initial worker impl | Erik Johnston | 2017-06-16 | 2 | -1/+271 |
| | | |||||
* | | Typo | Erik Johnston | 2017-06-15 | 1 | -1/+3 |
| | | |||||
* | | Add some more stats | Erik Johnston | 2017-06-15 | 1 | -0/+7 |
| | | |||||
* | | Fix phone home stats | Erik Johnston | 2017-06-14 | 1 | -36/+13 |
|/ | |||||
* | Merge pull request #2127 from APwhitehat/alreadystarted | Erik Johnston | 2017-04-27 | 1 | -0/+3 |
|\ | | | | | print something legible if synapse already running | ||||
| * | synctl.py: Check if synapse is already running | Anant Prakash | 2017-04-13 | 1 | -0/+3 |
| | | |||||
* | | Queried CONDITIONAL_REQUIREMENTS | Matthew Wolff | 2017-04-18 | 1 | -2/+5 |
| | | |||||
* | | Fixed travis build failure | Matthew Wolff | 2017-04-17 | 1 | -3/+1 |
| | | | | | | | | Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com> | ||||
* | | web_server_root documentation fix | Matthew Wolff | 2017-04-17 | 1 | -2/+1 |
|/ | | | | Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com> | ||||
* | Merge pull request #2115 from matrix-org/erikj/dedupe_federation_repl | Erik Johnston | 2017-04-12 | 2 | -18/+6 |
|\ | | | | | Reduce federation replication traffic | ||||
| * | Move get_presence_list_* to SlaveStore | Erik Johnston | 2017-04-11 | 2 | -24/+3 |
| | | |||||
| * | Move get_interested_parties | Erik Johnston | 2017-04-11 | 1 | -3/+2 |
| | | |||||
| * | Reduce federation presence replication traffic | Erik Johnston | 2017-04-10 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Remove HTTP replication APIs | Erik Johnston | 2017-04-11 | 1 | -4/+0 |
|/ | |||||
* | Fix up federation SendQueue and document types | Erik Johnston | 2017-04-07 | 1 | -65/+1 |
| | |||||
* | Merge pull request #2107 from HarHarLinks/patch-1 | Erik Johnston | 2017-04-07 | 1 | -1/+1 |
|\ | | | | | fix typo in synctl help | ||||
| * | fix typo in synctl help | Kim Brose | 2017-04-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2103 from matrix-org/erikj/no-double-encode | Erik Johnston | 2017-04-07 | 2 | -6/+2 |
|\ \ | | | | | | | Don't double encode replication data | ||||
| * | | Don't double json encode typing replication data | Erik Johnston | 2017-04-05 | 1 | -3/+1 |
| | | | |||||
| * | | Don't double json encode federation replication data | Erik Johnston | 2017-04-05 | 1 | -3/+1 |
| | | | |||||
* | | | Comment | Erik Johnston | 2017-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | Docs | Erik Johnston | 2017-04-06 | 1 | -0/+7 |
| | | | |||||
* | | | Don't immediately notify the master about users whose syncs have gone away | Erik Johnston | 2017-04-05 | 1 | -4/+36 |
|/ / | |||||
* | | Merge pull request #2097 from matrix-org/erikj/repl_tcp_client | Erik Johnston | 2017-04-05 | 7 | -402/+271 |
|\ \ | | | | | | | Move to using TCP replication | ||||
| * | | Add comment | Erik Johnston | 2017-04-04 | 1 | -0/+5 |
| | | | |||||
| * | | Add the appropriate amount of preserve_fn | Erik Johnston | 2017-04-04 | 4 | -17/+19 |
| | | | |||||
| * | | Shuffle and comment synchrotron presence | Erik Johnston | 2017-04-04 | 1 | -9/+11 |
| | | | |||||
| * | | Move where we ack federation | Erik Johnston | 2017-04-04 | 1 | -7/+16 |
| | | | |||||
| * | | Update all the workers and master to use TCP replication | Erik Johnston | 2017-04-03 | 7 | -401/+252 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-04-04 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | | | | erikj/repl_tcp_server | ||||
| * | | Merge pull request #2078 from APwhitehat/assertuserfriendly | Erik Johnston | 2017-03-31 | 1 | -1/+2 |
| |\ \ | | | | | | | | | add user friendly report of assertion error in synctl.py |