| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into develop | Andrew Morgan | 2019-10-03 | 1 | -2/+4 |
|\ |
|
| * | Replace client_secret with <redacted> in server logs (#6158) | Andrew Morgan | 2019-10-03 | 1 | -2/+4 |
* | | Edit SimpleHttpClient to reference that header keys can be passed as str or b... | Andrew Morgan | 2019-09-27 | 1 | -6/+6 |
|/ |
|
* | Fix well-known lookups with the federation certificate whitelist (#5997) | Amber Brown | 2019-09-14 | 1 | -1/+1 |
* | Trace how long it takes for the send trasaction to complete, including retrys... | Jorik Schellekens | 2019-09-05 | 2 | -37/+51 |
* | Add opentracing to all client servlets (#5983) | Jorik Schellekens | 2019-09-05 | 2 | -6/+13 |
* | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 1 | -33/+1 |
* | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 1 | -1/+1 |
* | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Erik Johnston | 2019-08-27 | 2 | -208/+217 |
|\ |
|
| * | Fix off by one error in SRV result shuffling | Erik Johnston | 2019-08-27 | 1 | -8/+13 |
| * | Fixup comments | Erik Johnston | 2019-08-23 | 1 | -1/+9 |
| * | Fix logcontexts | Erik Johnston | 2019-08-23 | 1 | -4/+8 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l... | Erik Johnston | 2019-08-22 | 3 | -47/+128 |
| |\ |
|
| * | | Remove now unused pick_server_from_list | Erik Johnston | 2019-08-20 | 1 | -30/+0 |
| * | | Fixup _sort_server_list to be slightly more efficient | Erik Johnston | 2019-08-20 | 1 | -2/+11 |
| * | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 2 | -189/+202 |
* | | | Opentracing across workers (#5771) | Jorik Schellekens | 2019-08-22 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 2 | -37/+115 |
|\ \ |
|
| * | | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 1 | -11/+12 |
| * | | Fixup changelog and remove debug logging | Erik Johnston | 2019-08-16 | 1 | -4/+1 |
| * | | Retry well known on fail. | Erik Johnston | 2019-08-15 | 2 | -34/+114 |
| |/ |
|
* / | Opentracing misc (#5856) | Jorik Schellekens | 2019-08-16 | 1 | -10/+13 |
|/ |
|
* | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 1 | -22/+60 |
* | Make default well known cache global again. | Erik Johnston | 2019-08-13 | 1 | -1/+4 |
* | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 2 | -153/+197 |
* | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 1 | -0/+4 |
* | Handle incorrectly encoded query params correctly | Erik Johnston | 2019-08-01 | 1 | -1/+6 |
* | Share SSL options for well-known requests | Erik Johnston | 2019-07-31 | 1 | -11/+5 |
* | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 2 | -14/+31 |
|\ |
|
| * | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 2 | -14/+31 |
* | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 4 | -53/+45 |
|/ |
|
* | Add basic opentracing support (#5544) | Jorik Schellekens | 2019-07-11 | 2 | -5/+30 |
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 7 | -7/+7 |
* | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 1 | -10/+16 |
* | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 1 | -36/+41 |
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 10 | -287/+321 |
* | Don't log exception when failing to fetch remote content. | Erik Johnston | 2019-06-07 | 1 | -4/+9 |
* | Improve docstrings on MatrixFederationClient. (#5332) | Richard van der Hoff | 2019-06-04 | 1 | -16/+55 |
* | Remove spurious debug from MatrixFederationHttpClient.get_json (#5287) v0.99.5.1.dev0 | Richard van der Hoff | 2019-05-29 | 1 | -4/+0 |
* | Fix error code for invalid parameter | Aaron Raimist | 2019-05-24 | 1 | -1/+1 |
* | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 2 | -14/+40 |
* | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 1 | -20/+25 |
* | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 1 | -1/+1 |
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 1 | -0/+1 |
* | Clean up backoff_on_404 and metehod calls | Andrew Morgan | 2019-03-21 | 1 | -9/+13 |
* | kwargs doesn't like commas on calling funcs either. TIL | Andrew Morgan | 2019-03-20 | 1 | -2/+2 |
* | lint | Andrew Morgan | 2019-03-20 | 1 | -2/+6 |
* | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -49/+28 |
* | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -5/+5 |
* | Just return if not doing any trailing slash shennanigans | Andrew Morgan | 2019-03-20 | 1 | -0/+2 |
* | lint | Andrew Morgan | 2019-03-18 | 1 | -1/+1 |
* | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -16/+17 |
* | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
* | receiving a 400 caused an exception. handle it | Andrew Morgan | 2019-03-13 | 1 | -5/+12 |
* | is this what purgatory feels like | Andrew Morgan | 2019-03-13 | 1 | -3/+3 |
* | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -18/+13 |
* | i should have given up | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
* | there comes a time when you should give up. but you dont | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
* | as above | Andrew Morgan | 2019-03-13 | 1 | -2/+4 |
* | no kwargs today | Andrew Morgan | 2019-03-13 | 1 | -7/+12 |
* | Or perhaps I was the one who was drunk | Andrew Morgan | 2019-03-13 | 1 | -6/+3 |
* | go home python, you're drunk | Andrew Morgan | 2019-03-13 | 1 | -4/+2 |
* | Syntax checker is bork | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
* | Destructure again | Andrew Morgan | 2019-03-13 | 1 | -7/+8 |
* | Are you happy now | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
* | Syntax test | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
* | Remove testing code | Andrew Morgan | 2019-03-13 | 1 | -3/+0 |
* | Add missing docstring detail | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
* | Fix syntax issues | Andrew Morgan | 2019-03-13 | 1 | -7/+10 |
* | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 1 | -32/+71 |
* | Retry on 400:M_UNRECOGNIZED | Andrew Morgan | 2019-03-13 | 1 | -6/+10 |
* | Fix paranthesis indent | Andrew Morgan | 2019-03-13 | 1 | -1/+2 |
* | Add workaround note | Andrew Morgan | 2019-03-13 | 1 | -10/+4 |
* | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 1 | -63/+52 |
* | Retry certain federation requests on 404 | Andrew Morgan | 2019-03-08 | 1 | -0/+45 |
* | Minor docstring fixes for MatrixFederationAgent (#4765) | Andrew Morgan | 2019-02-28 | 1 | -1/+5 |
* | Log tracebacks correctly | Erik Johnston | 2019-02-25 | 1 | -4/+4 |
* | Fix TaskStopped exceptions when outbound requests time out (#4690) | Richard van der Hoff | 2019-02-20 | 3 | -18/+29 |
* | Cleanup top level request exception logging | Erik Johnston | 2019-02-18 | 1 | -3/+3 |
* | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) | Richard van der Hoff | 2019-02-11 | 1 | -2/+2 |
* | Merge pull request #4546 from matrix-org/rav/silence_critical_error_from_fede... | Richard van der Hoff | 2019-02-01 | 1 | -2/+15 |
|\ |
|
| * | Fix noisy "twisted.internet.task.TaskStopped" errors in logs | Richard van der Hoff | 2019-02-01 | 1 | -2/+15 |
* | | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_known | Richard van der Hoff | 2019-02-01 | 1 | -19/+6 |
|\ \ |
|
| * | | Treat an invalid .well-known the same as an absent one | Richard van der Hoff | 2019-02-01 | 1 | -19/+6 |
* | | | Fix b'ab' noise in logs | Richard van der Hoff | 2019-02-01 | 1 | -1/+1 |
|/ / |
|
* | | Cache failures to parse .well-known | Richard van der Hoff | 2019-02-01 | 1 | -13/+43 |
* | | better logging for federation connections | Richard van der Hoff | 2019-01-31 | 1 | -5/+16 |
* | | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 1 | -5/+5 |
|/ |
|
* | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanups | Richard van der Hoff | 2019-01-30 | 1 | -9/+11 |
|\ |
|
| * | fix exception text | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
| * | Also jitter the invalid cache period | Richard van der Hoff | 2019-01-30 | 1 | -9/+11 |
* | | Follow redirects on .well-known (#4520) | Richard van der Hoff | 2019-01-30 | 1 | -2/+4 |
|/ |
|
* | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 1 | -2/+88 |
* | Relax requirement for a content-type on .well-known (#4511) | Richard van der Hoff | 2019-01-29 | 1 | -20/+13 |
* | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 1 | -4/+110 |
* | docstrings for _RoutingResult | Richard van der Hoff | 2019-01-28 | 1 | -0/+36 |
* | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -0/+19 |
* | MatrixFederationAgent: factor out routing logic | Richard van der Hoff | 2019-01-28 | 1 | -18/+62 |
* | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 1 | -11/+12 |
* | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+10 |
* | Merge pull request #4464 from matrix-org/rav/fix_srv_lookup | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 |
|\ |
|
| * | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 |
* | | Fix UnboundLocalError in post_urlencoded_get_json (#4460) | Richard van der Hoff | 2019-01-24 | 1 | -2/+3 |
|/ |
|
* | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 2 | -63/+86 |
* | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 |
* | Kill off matrix_federation_endpoint | Richard van der Hoff | 2019-01-22 | 2 | -145/+0 |
* | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 1 | -27/+10 |
* | MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -0/+147 |
* | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 3 | -72/+141 |
* | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 2 | -86/+19 |
* | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 1 | -12/+11 |
* | Fixup docstrings for matrixfederationclient | Erik Johnston | 2019-01-09 | 1 | -68/+73 |
* | Use RequestSendFailed when fail to parse content type headers | Erik Johnston | 2019-01-08 | 1 | -5/+5 |
* | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -33/+72 |
* | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 2 | -169/+243 |
* | fix parse_string docstring | Richard van der Hoff | 2018-11-08 | 1 | -5/+4 |
* | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 1 | -4/+4 |
* | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 1 | -6/+6 |
|\ |
|
| * | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 1 | -6/+21 |
| |\ |
|
| * | | Fix exception documentation in matrixfederationclient.py | Travis Ralston | 2018-09-26 | 1 | -6/+6 |
* | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 1 | -13/+18 |
* | | | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 1 | -38/+40 |
| |/
|/| |
|
* | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
|/ |
|
* | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 1 | -14/+35 |
|\ |
|
| * | Fix spurious exceptions when client closes conncetion | Erik Johnston | 2018-09-20 | 1 | -14/+35 |
* | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 1 | -1/+1 |
|/ |
|
* | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 1 | -2/+2 |
* | Update to use new timeout function everywhere. | Erik Johnston | 2018-09-19 | 2 | -12/+17 |
* | Merge pull request #3909 from turt2live/travis/fix-logging-1 | Amber Brown | 2018-09-19 | 1 | -4/+4 |
|\ |
|
| * | Destination is a string | Travis Ralston | 2018-09-18 | 1 | -4/+4 |
* | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name | Amber Brown | 2018-09-19 | 1 | -3/+10 |
|\ \
| |/
|/| |
|
| * | Set SNI to the server_name, not whatever was in the SRV record | Richard van der Hoff | 2018-09-18 | 1 | -3/+10 |
* | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 1 | -149/+236 |
|/ |
|
* | Fix more b'abcd' noise in metrics | Richard van der Hoff | 2018-09-17 | 2 | -12/+12 |
* | Fix some b'abcd' noise in logs and metrics | Richard van der Hoff | 2018-09-17 | 2 | -5/+8 |
* | Add an awful secondary timeout to fix wedged requests | Erik Johnston | 2018-09-14 | 1 | -0/+11 |
* | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 4 | -7/+12 |
|\ |
|
| * | fix | Amber Brown | 2018-09-15 | 1 | -3/+3 |
| * | fix | Amber Brown | 2018-09-14 | 1 | -1/+4 |
| * | fix | Amber Brown | 2018-09-14 | 1 | -1/+1 |
| * | redact better | Amber Brown | 2018-09-14 | 1 | -2/+2 |
| * | we do that higher up | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| * | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 | Amber Brown | 2018-09-14 | 1 | -4/+10 |
| |\ |
|
| * | | buffer? | Amber Brown | 2018-09-14 | 1 | -1/+2 |
* | | | Measure outbound requests | Erik Johnston | 2018-09-14 | 1 | -3/+6 |
| |/
|/| |
|
* | | merge (#3576) | Amber Brown | 2018-09-14 | 1 | -4/+10 |
|/ |
|
* | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 1 | -56/+42 |
* | Log outbound requests when we retry | Erik Johnston | 2018-09-12 | 1 | -75/+74 |
* | Timeout reading body for outbound HTTP requests | Erik Johnston | 2018-09-12 | 1 | -7/+45 |
* | Port http/ to Python 3 (#3771) | Amber Brown | 2018-09-06 | 3 | -173/+117 |
* | Fix bug when federation_domain_whitelist is an emtpy list | Erik Johnston | 2018-08-24 | 1 | -1/+1 |
* | Merge tag 'v0.33.3rc2' into develop | Richard van der Hoff | 2018-08-21 | 1 | -1/+7 |
|\ |
|
| * | Fix exceptions when a connection is closed before we read the headers | Richard van der Hoff | 2018-08-20 | 1 | -1/+7 |
* | | Fix typo | Erik Johnston | 2018-08-21 | 1 | -4/+4 |
* | | Make the in flight requests metrics thread safe | Erik Johnston | 2018-08-20 | 1 | -3/+10 |
|/ |
|
* | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 2 | -16/+44 |
* | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 1 | -4/+13 |
|\ |
|
| * | Use a producer to stream back responses | Richard van der Hoff | 2018-08-15 | 1 | -4/+13 |
* | | Refactor request logging code | Richard van der Hoff | 2018-08-15 | 2 | -92/+179 |
|/ |
|
* | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 2 | -2/+2 |
* | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 2 | -8/+8 |
|\ |
|
| * | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 3 | -8/+14 |
| |\ |
|
| * \ | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... | Jeroen | 2018-07-14 | 8 | -160/+105 |
| |\ \ |
|
| * \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 6 | -21/+103 |
| |\ \ \ |
|
| * | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 1 | -1/+1 |
| * | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 2 | -2/+3 |
| * | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 2 | -8/+7 |
* | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 1 | -2/+5 |
* | | | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -34/+27 |
* | | | | | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 1 | -9/+5 |
* | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -11/+34 |
| |_|_|/
|/| | | |
|
* | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 1 | -2/+4 |
* | | | | pep8 | Erik Johnston | 2018-07-18 | 1 | -1/+2 |
* | | | | Add response code to response timer metrics | Erik Johnston | 2018-07-18 | 1 | -3/+5 |
* | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 1 | -2/+3 |
* | | | | rerun isort with latest version | Krombel | 2018-07-16 | 1 | -3/+1 |
* | | | | check isort by travis | Krombel | 2018-07-16 | 2 | -2/+4 |
| |_|/
|/| | |
|
* | | | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 1 | -1/+1 |
* | | | Refactor logcontext resource usage tracking (#3501) | Richard van der Hoff | 2018-07-10 | 2 | -81/+26 |
* | | | run isort | Amber Brown | 2018-07-09 | 8 | -78/+78 |
| |/
|/| |
|
* | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -5/+42 |
* | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 1 | -3/+31 |
* | | replace invalid utf8 with \ufffd | Matthew Hodgson | 2018-07-02 | 1 | -2/+2 |
* | | a fix which doesn't NPE everywhere | Matthew Hodgson | 2018-07-01 | 1 | -9/+17 |
* | | don't mix unicode strings with utf8-in-byte-strings | Matthew Hodgson | 2018-07-01 | 1 | -2/+9 |
* | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 4 | -8/+8 |
* | | Need to pass reactor to endpoint fac | Erik Johnston | 2018-06-25 | 1 | -1/+1 |
* | | Remove all global reactor imports & pass it around explicitly (#3424) | Amber Brown | 2018-06-25 | 1 | -7/+9 |
|/ |
|
* | Merge pull request #3419 from matrix-org/rav/events_per_request | Richard van der Hoff | 2018-06-22 | 1 | -1/+4 |
|\ |
|
| * | Log number of events fetched from DB | Richard van der Hoff | 2018-06-21 | 1 | -1/+4 |
* | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 2 | -5/+6 |
|/ |
|
* | Fix inflight requests metric (incorrect name & traceback) (#3413) | Amber Brown | 2018-06-20 | 1 | -3/+7 |
* | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 1 | -2/+23 |
|\ |
|
| * | pep8 | David Baker | 2018-06-06 | 1 | -3/+3 |
| * | More doc fixes | David Baker | 2018-06-06 | 1 | -2/+2 |
| * | fix pep8 | David Baker | 2018-06-05 | 1 | -3/+5 |
| * | doc fixes | David Baker | 2018-06-05 | 1 | -6/+6 |
| * | Docstring | David Baker | 2018-06-04 | 1 | -0/+14 |
| * | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 1 | -3/+5 |
| |\ |
|
| * | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 1 | -2/+7 |
* | | | redact_uri in two missed log paths | Michael Telatynski | 2018-06-06 | 1 | -2/+2 |
* | | | factor out uri redaction into a method on http | Michael Telatynski | 2018-06-05 | 3 | -13/+17 |
* | | | Strip `access_token` from outgoing requests using existing regex | Michael Telatynski | 2018-06-02 | 1 | -1/+6 |
* | | | update to more consistently use seconds in any metrics or logging | Amber Brown | 2018-05-28 | 1 | -19/+19 |
* | | | update metrics to be in seconds | Amber Brown | 2018-05-28 | 2 | -13/+13 |
* | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 2 | -4/+6 |
|\ \ \ |
|
| * \ \ | Merge pull request #3246 from NotAFile/py3-repr-string | Amber Brown | 2018-05-24 | 1 | -1/+1 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | use repr, not str | Adrian Tschira | 2018-05-19 | 1 | -1/+1 |
| * | | | Merge pull request #3243 from NotAFile/py3-six-3 | Erik Johnston | 2018-05-24 | 1 | -3/+5 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
| | |/ |
|
* | | | fixes | Amber Brown | 2018-05-23 | 1 | -7/+7 |
* | | | cleanup | Amber Brown | 2018-05-22 | 2 | -3/+6 |
* | | | cleanup pep8 errors | Amber Brown | 2018-05-22 | 1 | -28/+86 |
* | | | cleanups, self-registration | Amber Brown | 2018-05-22 | 1 | -12/+3 |
* | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 3 | -4/+213 |
|\| | |
|
| * | | Don't store context | Erik Johnston | 2018-05-22 | 1 | -8/+5 |
| * | | Move in_flight_requests_count to be a callback metric | Erik Johnston | 2018-05-22 | 1 | -10/+21 |
| * | | Add in flight request metrics | Erik Johnston | 2018-05-21 | 2 | -2/+154 |
| |/ |
|
| * | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 1 | -2/+74 |
| |\ |
|
| | * | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 1 | -2/+74 |
* | | | rest of the changes | Amber Brown | 2018-05-21 | 2 | -85/+25 |
* | | | replacing portions | Amber Brown | 2018-05-21 | 2 | -24/+10 |
|/ / |
|
* / | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 3 | -13/+15 |
|/ |
|
* | Remove redundant request_handler decorator | Richard van der Hoff | 2018-05-10 | 2 | -9/+4 |
* | Factor wrap_request_handler_with_logging out of wrap_request_handler | Richard van der Hoff | 2018-05-10 | 1 | -54/+66 |
* | Remove include_metrics param | Richard van der Hoff | 2018-05-10 | 1 | -17/+7 |
* | Move outgoing_responses_counter handling to RequestMetrics | Richard van der Hoff | 2018-05-10 | 2 | -4/+2 |
* | Bump requests_counter in wrapped_request_handler | Richard van der Hoff | 2018-05-10 | 1 | -4/+11 |
* | Move RequestMetrics handling into SynapseRequest.processing() | Richard van der Hoff | 2018-05-10 | 2 | -24/+64 |
* | Make RequestMetrics take a raw time rather than a clock | Richard van der Hoff | 2018-05-10 | 2 | -6/+6 |
* | Move request_id management into SynapseRequest | Richard van der Hoff | 2018-05-10 | 2 | -15/+25 |
* | Move RequestsMetrics to its own file | Richard van der Hoff | 2018-05-09 | 2 | -124/+151 |
* | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown | Richard van der Hoff | 2018-05-03 | 1 | -3/+8 |
|\ |
|
| * | Don't abortConnection() if the transport connection has already closed. | Will Hunt | 2018-05-03 | 1 | -3/+8 |
* | | add missing param to cancelled_to_request_timed_out_error | Richard van der Hoff | 2018-05-02 | 1 | -1/+1 |
* | | Merge pull request #3154 from NotAFile/py3-stringio | Richard van der Hoff | 2018-04-30 | 1 | -2/+2 |
|\ \ |
|
| * | | replace stringIO imports | Adrian Tschira | 2018-04-28 | 1 | -2/+2 |
* | | | Merge pull request #3155 from NotAFile/py3-bytes-1 | Richard van der Hoff | 2018-04-30 | 2 | -2/+2 |
|\ \ \ |
|
| * | | | more bytes strings | Adrian Tschira | 2018-04-29 | 2 | -2/+2 |
| |/ / |
|
* | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 1 | -2/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 1 | -2/+1 |
* | | | Backport deferred.addTimeout | Richard van der Hoff | 2018-04-27 | 3 | -6/+9 |
* | | | Use deferred.addTimeout instead of time_bound_deferred | Richard van der Hoff | 2018-04-23 | 3 | -29/+48 |
|/ / |
|
* | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 2 | -5/+5 |
|\ \ |
|
| * | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 2 | -5/+5 |
* | | | Merge pull request #3016 from silkeh/improve-service-lookups | Richard van der Hoff | 2018-04-09 | 1 | -95/+8 |
|\ \ \ |
|
| * | | | Remove address resolution of hosts in SRV records | Silke | 2018-04-04 | 1 | -95/+8 |
| |/ / |
|
* | | | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics" | Richard van der Hoff | 2018-04-09 | 1 | -0/+26 |
* | | | Add response size metrics | Erik Johnston | 2018-04-06 | 1 | -0/+7 |
* | | | use PUT instead of POST for federating groups/m.join_policy | Krombel | 2018-04-06 | 1 | -1/+5 |