| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_test | Richard van der Hoff | 2018-07-04 | 2 | -2/+16 |
| |\ | | | | | Reinstate lost run_on_reactor in unit test | ||||
| | * | Reinstate lost run_on_reactor in unit test | Richard van der Hoff | 2018-07-04 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | a61738b removed a call to run_on_reactor from a unit test, but that call was doing something useful, in making the function in question asynchronous. Reinstate the call and add a check that we are testing what we wanted to be testing. | ||||
| * | | Merge pull request #3473 from matrix-org/erikj/thread_cache | Erik Johnston | 2018-07-04 | 2 | -1/+3 |
| |\ \ | | | | | | | Invalidate cache on correct thread | ||||
| | * | | Correct newsfile | Erik Johnston | 2018-07-02 | 2 | -0/+1 |
| | | | | |||||
| | * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| | | | | |||||
| | * | | Invalidate cache on correct thread | Erik Johnston | 2018-07-02 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #3474 from matrix-org/erikj/py3_auth | Erik Johnston | 2018-07-04 | 2 | -1/+6 |
| |\ \ \ | |_|/ |/| | | Fix up auth check | ||||
| | * | | Newsfile | Erik Johnston | 2018-07-02 | 1 | -0/+0 |
| | | | | |||||
| | * | | Avoid relying on int vs None comparison | Erik Johnston | 2018-07-02 | 1 | -1/+5 |
| | | | | | | | | | | | | | Python 3 doesn't support comparing None to ints | ||||
| | * | | Ensure that we define sender_domain | Erik Johnston | 2018-07-02 | 1 | -0/+1 |
| | |/ | |||||
| * | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 5 | -25/+122 |
| | | | | | | | | | | | Make sure that server_names used in auth headers are sane, and reject them with a sensible error code, before they disappear off into the depths of the system. | ||||
| * | | Merge pull request #3470 from matrix-org/matthew/fix-utf8-logging | Richard van der Hoff | 2018-07-02 | 2 | -2/+18 |
| |\ \ | |/ |/| | don't mix unicode strings with utf8-in-byte-strings | ||||
| | * | news snippet | Matthew Hodgson | 2018-07-02 | 1 | -0/+1 |
| | | | |||||
| | * | 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 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise we explode with: ``` Traceback (most recent call last): File /usr/lib/python2.7/logging/handlers.py, line 78, in emit logging.FileHandler.emit(self, record) File /usr/lib/python2.7/logging/__init__.py, line 950, in emit StreamHandler.emit(self, record) File /usr/lib/python2.7/logging/__init__.py, line 887, in emit self.handleError(record) File /usr/lib/python2.7/logging/__init__.py, line 810, in handleError None, sys.stderr) File /usr/lib/python2.7/traceback.py, line 124, in print_exception _print(file, 'Traceback (most recent call last):') File /usr/lib/python2.7/traceback.py, line 13, in _print file.write(str+terminator) File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_io.py, line 170, in write self.log.emit(self.level, format=u{log_io}, log_io=line) File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_logger.py, line 144, in emit self.observer(event) File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_observer.py, line 136, in __call__ errorLogger = self._errorLoggerForObserver(brokenObserver) File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_observer.py, line 156, in _errorLoggerForObserver if obs is not observer File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_observer.py, line 81, in __init__ self.log = Logger(observer=self) File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_logger.py, line 64, in __init__ namespace = self._namespaceFromCallingContext() File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/logger/_logger.py, line 42, in _namespaceFromCallingContext return currentframe(2).f_globals[__name__] File /home/matrix/.synapse/local/lib/python2.7/site-packages/twisted/python/compat.py, line 93, in currentframe for x in range(n + 1): RuntimeError: maximum recursion depth exceeded while calling a Python object Logged from file site.py, line 129 File /usr/lib/python2.7/logging/__init__.py, line 859, in emit msg = self.format(record) File /usr/lib/python2.7/logging/__init__.py, line 732, in format return fmt.format(record) File /usr/lib/python2.7/logging/__init__.py, line 471, in format record.message = record.getMessage() File /usr/lib/python2.7/logging/__init__.py, line 335, in getMessage msg = msg % self.args UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 4: ordinal not in range(128) Logged from file site.py, line 129 ``` ...where the logger apparently recurses whilst trying to log the error, hitting the maximum recursion depth and killing everything badly. | ||||
| * | Merge pull request #3467 from matrix-org/hawkowl/contributor-requirements | Matthew Hodgson | 2018-06-30 | 2 | -5/+9 |
| |\ | | | | | Clarify "real name" in contributor requirements | ||||
| | * | topfile | Amber Brown | 2018-06-29 | 1 | -0/+0 |
| | | | |||||
| | * | clarification on what "real names" are | Amber Brown | 2018-06-29 | 1 | -5/+9 |
| | | | |||||
| * | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 5 | -30/+319 |
| |\ \ | | | | | | | Check the state of prev_events a bit more thoroughly when coming over federation | ||||
| | * | | topfile update | Amber Brown | 2018-06-28 | 1 | -2/+1 |
| | | | | |||||
| | * | | topfile | Amber Brown | 2018-06-27 | 1 | -0/+2 |
| | | | | |||||
| | * | | try and clean up | Amber Brown | 2018-06-27 | 1 | -3/+6 |
| | | | | |||||
| | * | | pep8 | Amber Brown | 2018-06-27 | 2 | -11/+6 |
| | | | | |||||
| | * | | cleanups | Amber Brown | 2018-06-27 | 1 | -1/+4 |
| | | | | |||||
| | * | | cleanups | Amber Brown | 2018-06-27 | 1 | -13/+15 |
| | | | | |||||
| | * | | stylistic cleanup | Amber Brown | 2018-06-27 | 1 | -6/+18 |
| | | | | |||||
| | * | | cleanups | Amber Brown | 2018-06-27 | 1 | -7/+6 |
| | | | | |||||
| | * | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 4 | -27/+301 |
| | | | | |||||
| * | | | Merge pull request #3465 from matrix-org/matthew/as_ip_lock | Matthew Hodgson | 2018-06-28 | 5 | -5/+69 |
| |\ \ \ | |_|/ |/| | | add ip_range_whitelist parameter to limit where ASes can connect from | ||||
| | * | | add test | Matthew Hodgson | 2018-06-28 | 1 | -0/+33 |
| | | | | |||||
| | * | | add towncrier snippet | Matthew Hodgson | 2018-06-28 | 1 | -0/+1 |
| | | | | |||||
| | * | | fix tests | Matthew Hodgson | 2018-06-28 | 2 | -3/+16 |
| | | | | |||||
| | * | | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 3 | -2/+19 |
| |/ / | |||||
| * | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 40 | -62/+79 |
| | | | |||||
| * | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) | Amber Brown | 2018-06-28 | 2 | -2/+4 |
| |/ | |||||
| * | Better testing framework for homeserver-using things (#3446) | Amber Brown | 2018-06-27 | 3 | -0/+309 |
| | | |||||
| * | Merge pull request #3452 from matrix-org/revert-3451-hawkowl/sorteddict-api | Matthew Hodgson | 2018-06-26 | 2 | -4/+2 |
| |\ | | | | | Revert "Try to not use as much CPU in the StreamChangeCache" | ||||
| | * | Revert "Try to not use as much CPU in the StreamChangeCache" | Matthew Hodgson | 2018-06-26 | 2 | -4/+2 |
| |/ | |||||
| * | Merge pull request #3451 from matrix-org/hawkowl/sorteddict-api | Matthew Hodgson | 2018-06-26 | 2 | -2/+4 |
| |\ | | | | | Try to not use as much CPU in the cache | ||||
| | * | fixes | Amber Brown | 2018-06-26 | 1 | -2/+2 |
| | | | |||||
| | * | fixes | Amber Brown | 2018-06-26 | 2 | -2/+2 |
| | | | |||||
| | * | try and make loading items from the cache faster | Amber Brown | 2018-06-26 | 1 | -2/+4 |
| | | | |||||
| * | | Merge pull request #3449 from ↵ | Matthew Hodgson | 2018-06-26 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | matrix-org/dbkr/fix_deactivate_account_multiple_pending Fix error on deleting users pending deactivation | ||||
| | * | | Fix error on deleting users pending deactivation | David Baker | 2018-06-26 | 1 | -1/+3 |
| |/ / | | | | | | | Use simple_delete instead of simple_delete_one as commented | ||||
| * | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-api | Matthew Hodgson | 2018-06-26 | 3 | -3/+28 |
| |\ \ | |/ |/| | add GDPR erase param to deactivate API | ||||
| | * | update doc for deactivate API | Matthew Hodgson | 2018-06-26 | 2 | -3/+16 |
| | | | |||||
| | * | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 2 | -1/+13 |
| | | | |||||
| * | | Merge pull request #3438 from turt2live/travis/dont-print-access-tokens-in-logs | Amber Brown | 2018-06-26 | 1 | -2/+2 |
| |\ \ | | | | | | | Stop including access tokens in warnings in the log | ||||
| | * | | Don't print invalid access tokens in the logs | Travis Ralston | 2018-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Tokens shouldn't be appearing the logs, valid or invalid. Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
| * | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-parts | Erik Johnston | 2018-06-25 | 1 | -2/+6 |
| |\ \ \ | | | | | | | | | allow non-consented users to still part rooms (to let us autopart them) | ||||
| | * | | | allow non-consented users to still part rooms (to let us autopart them) | Matthew Hodgson | 2018-06-25 | 1 | -2/+6 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #3443 from matrix-org/erikj/fast_filter_servers | Erik Johnston | 2018-06-25 | 1 | -0/+41 |
| |\ \ \ | |/ / |/| | | Add fast path to _filter_events_for_server | ||||
| | * | | Actually fix it | Erik Johnston | 2018-06-25 | 1 | -3/+3 |
| | | | | |||||
| | * | | Comment | Erik Johnston | 2018-06-25 | 1 | -0/+8 |
| | | | | |||||
| | * | | Fix bug with assuming wrong type | Erik Johnston | 2018-06-25 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add fast path to _filter_events_for_server | Erik Johnston | 2018-06-25 | 1 | -1/+34 |
| |/ / | | | | | | | | | | | Most rooms have a trivial history visibility like "shared" or "world_readable", especially large rooms, so lets not bother getting the full membership of those rooms in that case. | ||||
| * | | typos | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | typo | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | Need to pass reactor to endpoint fac | Erik Johnston | 2018-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | Use towncrier to build the changelog (#3425) | Amber Brown | 2018-06-25 | 20 | -1/+55 |
| | | | |||||
| * | | Merge pull request #3441 from matrix-org/erikj/redo_erasure | Erik Johnston | 2018-06-25 | 9 | -26/+216 |
| |\ \ | | | | | | | Fix user erasure and re-enable | ||||
| | * | | Add UserErasureWorkerStore to workers | Erik Johnston | 2018-06-25 | 1 | -0/+2 |
| | | | | |||||
| | * | | Revert "Revert "Merge pull request #3431 from ↵ | Erik Johnston | 2018-06-25 | 8 | -26/+214 |
| | |/ | | | | | | | | | | | matrix-org/rav/erasure_visibility"" This reverts commit 1d009013b3c3e814177afc59f066e02a202b21cd. | ||||
| * / | Remove all global reactor imports & pass it around explicitly (#3424) | Amber Brown | 2018-06-25 | 9 | -22/+29 |
| |/ | |||||
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 8 | -214/+26 |
| | | | | | | This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing changes made to b4a5d767a94f1680d07edfd583aae54ce422573e. | ||||
| * | Merge pull request #3435 from matrix-org/rav/fix_event_push_actions_tablescan | Richard van der Hoff | 2018-06-22 | 1 | -1/+8 |
| |\ | | | | | Fix event_push_actions tablescan when reinserting events | ||||
| | * | Deleting from event_push_actions needs to use an index | Mark Haines | 2018-06-22 | 1 | -1/+8 |
| | | | |||||
| * | | Merge pull request #3434 from matrix-org/rav/search_logging | Richard van der Hoff | 2018-06-22 | 1 | -0/+14 |
| |\ \ | |/ |/| | Add some logging to /search and /context queries | ||||
| | * | Also log number of events for serach context | Erik Johnston | 2018-06-22 | 1 | -0/+5 |
| | | | |||||
| | * | Add some logging to search queries | Erik Johnston | 2018-06-22 | 1 | -0/+9 |
| |/ | |||||
| * | Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterable | Richard van der Hoff | 2018-06-22 | 1 | -1/+1 |
| |\ | | | | | Make _get_joined_hosts_cache cache non-iterable | ||||
| | * | Make _get_joined_hosts_cache cache non-iterable | Erik Johnston | 2018-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotation | Richard van der Hoff | 2018-06-22 | 1 | -3/+5 |
| |\ \ | |/ |/| | Make push actions rotation configurable | ||||
| | * | Make push actions rotation configurable | Erik Johnston | 2018-06-22 | 1 | -3/+5 |
| | | | |||||
| * | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 8 | -26/+214 |
| |\ \ | | | | | | | Support hiding events from deleted users | ||||
| | * | | Filter out erased messages | Richard van der Hoff | 2018-06-12 | 2 | -22/+68 |
| | | | | | | | | | | | | | Redact any messges sent by erased users. | ||||
| | * | | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 3 | -4/+20 |
| | | | | |||||
| | * | | UserErasureStore | Richard van der Hoff | 2018-06-12 | 3 | -0/+126 |
| | | | | | | | | | | | | | to store which users have been erased | ||||
| * | | | Merge pull request #3428 from matrix-org/erikj/persisted_pdu | Erik Johnston | 2018-06-22 | 2 | -30/+27 |
| |\| | | | | | | | | Simplify get_persisted_pdu | ||||
| | * | | simplify get_persisted_pdu | Richard van der Hoff | 2018-06-12 | 2 | -30/+27 |
| | | | | | | | | | | | | | | | | it doesn't make much sense to use get_persisted_pdu on the receive path: just get the event straight from the store. | ||||
| * | | | Merge pull request #3427 from matrix-org/erikj/remove_filters | Erik Johnston | 2018-06-22 | 3 | -92/+35 |
| |\| | | |/ |/| | remove dead filter_events_for_clients | ||||
| | * | remove dead filter_events_for_clients | Richard van der Hoff | 2018-06-12 | 3 | -92/+35 |
| | | | | | | | | | | | | | This is only used by filter_events_for_client, so we can simplify the whole thing by just doing one user at a time, and removing a dead storage function to boot. | ||||
| * | | Merge pull request #3383 from matrix-org/rav/hacky_speedup_state_group_cache | Richard van der Hoff | 2018-06-22 | 3 | -32/+61 |
| |\ \ | | | | | | | Improve StateGroupCache efficiency for wildcard lookups | ||||
| | * | | Disable partial state group caching for wildcard lookups | Richard van der Hoff | 2018-06-22 | 3 | -32/+61 |
| |/ / | | | | | | | | | | | | | When _get_state_for_groups is given a wildcard filter, just do a complete lookup. Hopefully this will give us the best of both worlds by not filling up the ram if we only need one or two keys, but also making the cache still work for the federation reader usecase. | ||||
| * | | Merge pull request #3382 from matrix-org/rav/optimise_state_groups | Richard van der Hoff | 2018-06-22 | 1 | -5/+1 |
| |\ \ | | | | | | | Optimise state_group_cache update | ||||
| | * | | Optimise state_group_cache update | Richard van der Hoff | 2018-06-11 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | (1) matrix-org-hotfixes has removed the intern calls; let's do the same here. (2) remove redundant iteritems() so we can used an optimised db update. | ||||
| * | | | Merge pull request #3419 from matrix-org/rav/events_per_request | Richard van der Hoff | 2018-06-22 | 3 | -1/+23 |
| |\ \ \ | | | | | | | | | Log number of events fetched from DB | ||||
| | * | | | Indirect evt_count updates via method call | Richard van der Hoff | 2018-06-22 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | so that we can stub it for the sentinel and not have a billion failing UTs | ||||
| | * | | | Log number of events fetched from DB | Richard van der Hoff | 2018-06-21 | 3 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we finish processing a request, log the number of events we fetched from the database to handle it. [I'm trying to figure out which requests are responsible for large amounts of event cache churn. It may turn out to be more helpful to add counts to the prometheus per-request/block metrics, but that is an extension to this code anyway.] | ||||
| * | | | | Merge pull request #3418 from matrix-org/rav/fix_metric_desc | Amber Brown | 2018-06-22 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix description of "python_gc_time" metric | ||||
| | * | | | | Fix description of "python_gc_time" metric | Richard van der Hoff | 2018-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 25 | -93/+141 |
| | | | | | | |||||
| * | | | | | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386) | Amber Brown | 2018-06-21 | 1 | -3/+7 |
| | | | | | | |||||
| * | | | | | Fix tcp protocol metrics naming (#3410) | Amber Brown | 2018-06-21 | 1 | -18/+35 |
| | |/ / / |/| | | | |||||
| * | | | | Merge pull request #3416 from matrix-org/rav/restart_indicator | Richard van der Hoff | 2018-06-20 | 2 | -12/+19 |
| |\ \ \ \ | |/ / / |/| | | | Write a clear restart indicator in logs | ||||
| | * | | | Write a clear restart indicator in logs | Richard van der Hoff | 2018-06-20 | 2 | -12/+19 |
| | | | | | | | | | | | | | | | | | | | | | I'm fed up with never being able to find the point a server restarted in the logs. | ||||
| * | | | | Merge pull request #3399 from costacruise/master | Richard van der Hoff | 2018-06-20 | 1 | -2/+6 |
| |\ \ \ \ | | | | | | | | | | | Add error code to room creation error | ||||
| | * | | | | Add error code to room creation error | Michael Wagner | 2018-06-14 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | This error code is mentioned in the documentation at https://matrix.org/docs/api/client-server/#!/Room32creation/createRoom | ||||
| * | | | | | Fix inflight requests metric (incorrect name & traceback) (#3413) | Amber Brown | 2018-06-20 | 1 | -3/+7 |
| | |/ / / |/| | | | |||||
| * | | | | spell gauge correctly | Matthew Hodgson | 2018-06-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-06-14 | 6 | -47/+243 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge tag 'v0.31.2' | Richard van der Hoff | 2018-06-14 | 6 | -47/+243 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY UPDATE: Prevent unauthorised users from setting state events in a room when there is no `m.room.power_levels` event in force in the room. (PR #3397) Discussion around the Matrix Spec change proposal for this change can be followed at https://github.com/matrix-org/matrix-doc/issues/1304. | ||||
| | | * | | | link to spec proposal from changelog v0.31.2 release-v0.31.2 | Richard van der Hoff | 2018-06-14 | 1 | -0/+3 |
| | | | | | | |||||
| | | * | | | v0.31.2 | Richard van der Hoff | 2018-06-14 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | changelog for 0.31.2 | Richard van der Hoff | 2018-06-14 | 1 | -0/+6 |
| | | | | | | |||||
| | | * | | | Merge pull request #3397 from matrix-org/rav/adjust_auth_rules | Richard van der Hoff | 2018-06-14 | 4 | -46/+232 |
| | | |\ \ \ | | | | | | | | | | | | | Adjust event auth rules when there is no PL event | ||||
| | | | * | | | Fix broken unit test | Richard van der Hoff | 2018-06-14 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We need power levels for this test to do what it is supposed to do. | ||||
| | | | * | | | remove spurious debug | Richard van der Hoff | 2018-06-14 | 1 | -2/+0 |
| | | | | | | | |||||
| | | | * | | | Make default state_default 50 | Richard van der Hoff | 2018-06-14 | 2 | -20/+167 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that, before there is a power-levels event in the room, you need a power level of at least 50 to send state. Partially addresses https://github.com/matrix-org/matrix-doc/issues/1192 | ||||
| | | | * | | | Clarify interface for event_auth | Richard van der Hoff | 2018-06-14 | 1 | -18/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop pretending that it returns a boolean, which just almost gave me a heart attack. | ||||
| | | | * | | | Refactor get_send_level to take a power_levels event | Richard van der Hoff | 2018-06-14 | 2 | -8/+39 |
| | | | |/ / | | | | | | | | | | | | | | | | it makes it easier for me to reason about | ||||
| * | | | | | add a last seen metric (#3396) | Amber Brown | 2018-06-14 | 1 | -0/+21 |
| | | | | | | |||||
| * | | | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 13 | -63/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #3368 from matrix-org/rav/fix_federation_client_host | Richard van der Hoff | 2018-06-13 | 1 | -14/+51 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix commandline federation_client to send the right Host header | ||||
| | * | | | | | Fix federation_client to send the right Host | Richard van der Hoff | 2018-06-12 | 1 | -14/+51 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | This appears to have stopped working since matrix.org moved to cloudflare. The Host header should match the name of the server, not whatever is in the SRV record. | ||||
| * | | | | | 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> | ||||
| * | | | | | Merge pull request #3390 from turt2live/travis/appsvc-metrics | Amber Brown | 2018-06-13 | 1 | -1/+2 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Use the RegistryProxy for appservices too | ||||
| | * | | | | Use the RegistryProxy for appservices too | Travis Ralston | 2018-06-12 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
| * | | | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 6 | -16/+115 |
| |\ \ \ \ | | | | | | | | | | | Remove email addresses / phone numbers from ID servers when they're removed from synapse | ||||
| | * | | | | 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 | 2 | -7/+7 |
| | | | | | | |||||
| | * | | | | Docstring | David Baker | 2018-06-04 | 1 | -0/+14 |
| | | | | | | |||||
| | * | | | | Fix comment | David Baker | 2018-06-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Missing yield | David Baker | 2018-06-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | docstring | David Baker | 2018-06-04 | 1 | -1/+9 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 24 | -74/+485 |
| | |\ \ \ \ | |||||
| | * | | | | | pep8 | David Baker | 2018-05-24 | 4 | -8/+13 |
| | | | | | | | |||||
| | * | | | | | comment | David Baker | 2018-05-24 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 2 | -3/+18 |
| | | | | | | | |||||
| | * | | | | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 4 | -12/+63 |
| | | | | | | | |||||
| * | | | | | | fix idiotic typo in state res | Matthew Hodgson | 2018-06-11 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-06-08 | 2 | -1/+13 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Merge tag 'v0.31.1' | Neil Johnson | 2018-06-08 | 3 | -5/+20 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in synapse v0.31.1 (2018-06-08) ======================================= v0.31.1 fixes a security bug in the ``get_missing_events`` federation API where event visibility rules were not applied correctly. We are not aware of it being actively exploited but please upgrade asap. Bug Fixes: * Fix event filtering in get_missing_events handler (PR #3371) | ||||
| | | * | | | | tweak changelog v0.31.1 release-v0.31.1 | Neil Johnson | 2018-06-08 | 1 | -2/+4 |
| | | | | | | | |||||
| | | * | | | | Update CHANGES.rst | Neil Johnson | 2018-06-08 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | changelog a bump version | Neil Johnson | 2018-06-08 | 2 | -1/+11 |
| | | | |_|/ | | |/| | | |||||
| | | * | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | fix various changelog bugs and typos | Matthew Hodgson | 2018-06-08 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #3372 from matrix-org/rav/better_verification_logging | David Baker | 2018-06-08 | 1 | -6/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | Try to log more helpful info when a sig verification fails | ||||
| | * | | | | | Try to log more helpful info when a sig verification fails | Richard van der Hoff | 2018-06-08 | 1 | -6/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, don't swallow the reason for the failure Secondly, don't assume all exceptions are verification failures Thirdly, log a bit of info about the key being used if debug is enabled | ||||
| * | | | | | | Merge pull request #3371 from matrix-org/rav/fix_get_missing_events | David Baker | 2018-06-08 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix event filtering in get_missing_events handler | ||||
| | * | | | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | |/ / / / / | |||||
| * / / / / / | fix various changelog bugs and typos | Matthew Hodgson | 2018-06-07 | 1 | -4/+3 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #3344 from Half-Shot/hs/as-metrics | Will Hunt | 2018-06-07 | 1 | -0/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add metrics to track appservice transactions | ||||
| | * | | | | | Let's try labels instead of label, that might work | Will Hunt | 2018-06-05 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Add metrics to track appservice transactions | Will Hunt | 2018-06-05 | 1 | -0/+22 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3363 from matrix-org/rav/fix_purge | Richard van der Hoff | 2018-06-07 | 1 | -7/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix event-purge-by-ts admin API | ||||
| | * | | | | | | fix log | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix event-purge-by-ts admin API | Richard van der Hoff | 2018-06-07 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got completely broken in 0.30. Fixes #3300. | ||||
| * | | | | | | | Merge pull request #3355 from matrix-org/rav/fix_federation_backfill | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix federation backfill from sqlite servers | ||||
| | * | | | | | | | Fix sql error in _get_state_groups_from_groups | Richard van der Hoff | 2018-06-06 | 1 | -1/+1 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this was called with a `(type, None)` entry in types (which is supposed to return all state of type `type`), it would explode with a sql error. | ||||
| * | | | | | | | Merge pull request #3356 from matrix-org/rav/add_missing_attr_dep | Amber Brown | 2018-06-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make sure that attr is installed | ||||
| | * | | | | | | | Add missing dependency on attr | Richard van der Hoff | 2018-06-06 | 1 | -0/+1 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've rcently added a dep on `attr`. I don't know why the CI didn't pick this up, but we should make it explicit anyway. | ||||
| * | | | | | | | Merge branch 'master' into develop | Neil Johnson | 2018-06-06 | 2 | -1/+59 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | Merge tag 'v0.31.0' | Neil Johnson | 2018-06-06 | 113 | -1642/+1426 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in synapse v0.31.0 (2018-06-06) ====================================== Most notable change from v0.30.0 is to switch to python prometheus library to improve system stats reporting. WARNING this changes a number of prometheus metrics in a backwards-incompatible manner. For more details, see `docs/metrics-howto.rst <docs/metrics-howto.rst#removal-of-deprecated-metrics--time-based-counters-becoming-histograms-in-0310>`_. Bug Fixes: * Fix metric documentation tables (PR #3341) * Fix LaterGuage error handling (694968f) * Fix replication metrics (b7e7fd2) Changes in synapse v0.31.0-rc1 (2018-06-04) ========================================== Features: * Switch to the Python Prometheus library (PR #3256, #3274) * Let users leave the server notice room after joining (PR #3287) Changes: * daily user type phone home stats (PR #3264) * Use iter* methods for _filter_events_for_server (PR #3267) * Docs on consent bits (PR #3268) * Remove users from user directory on deactivate (PR #3277) * Avoid sending consent notice to guest users (PR #3288) * disable CPUMetrics if no /proc/self/stat (PR #3299) * Add local and loopback IPv6 addresses to url_preview_ip_range_blacklist (PR #3312) Thanks to @thegcat! * Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (PR #3307) * Add private IPv6 addresses to example config for url preview blacklist (PR #3317) Thanks to @thegcat! * Reduce stuck read-receipts: ignore depth when updating (PR #3318) * Put python's logs into Trial when running unit tests (PR #3319) Changes, python 3 migration: * Replace some more comparisons with six (PR #3243) Thanks to @NotAFile! * replace some iteritems with six (PR #3244) Thanks to @NotAFile! * Add batch_iter to utils (PR #3245) Thanks to @NotAFile! * use repr, not str (PR #3246) Thanks to @NotAFile! * Misc Python3 fixes (PR #3247) Thanks to @NotAFile! * Py3 storage/_base.py (PR #3278) Thanks to @NotAFile! * more six iteritems (PR #3279) Thanks to @NotAFile! * More Misc. py3 fixes (PR #3280) Thanks to @NotAFile! * remaining isintance fixes (PR #3281) Thanks to @NotAFile! * py3-ize state.py (PR #3283) Thanks to @NotAFile! * extend tox testing for py3 to avoid regressions (PR #3302) Thanks to @krombel! * use memoryview in py3 (PR #3303) Thanks to @NotAFile! Bugs: * Fix federation backfill bugs (PR #3261) * federation: fix LaterGauge usage (PR #3328) Thanks to @intelfx! | ||||
| | | * | | | | | 7 char sha in changelog v0.31.0 release-v0.31.0 | Neil Johnson | 2018-06-06 | 1 | -3/+3 |
| | | | | | | | | |||||
| | | * | | | | | Update CHANGES.rst | Neil Johnson | 2018-06-06 | 1 | -4/+4 |
| | | | | | | | | |||||
| | | * | | | | | bump version and changelog | Neil Johnson | 2018-06-06 | 2 | -3/+12 |
| | | | | | | | | |||||
| | | * | | | | | Fix metric documentation tables (#3341) | Amber Brown | 2018-06-06 | 1 | -20/+30 |
| | | | | | | | | |||||
| | | * | | | | | Add note to changelog on prometheus metrics | Richard van der Hoff | 2018-06-06 | 1 | -1/+4 |
| | | | | | | | | |||||
| | | * | | | | | Merge commit 'b7e7fd2' into release-v0.31.0 | Richard van der Hoff | 2018-06-06 | 2 | -5/+8 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | bump version and changelog v0.31.0-rc1 | Neil Johnson | 2018-06-04 | 2 | -1/+47 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3349 from t3chguy/redact_as_request_token | Richard van der Hoff | 2018-06-06 | 2 | -3/+7 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Redact AS tokens in log (fixes to #3327) | ||||
| | * | | | | | | | also redact __str__ of ApplicationService used for logging | Michael Telatynski | 2018-06-06 | 1 | -1/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | redact_uri in two missed log paths | Michael Telatynski | 2018-06-06 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3347 from krombel/py3_extend_tox_2 | Amber Brown | 2018-06-06 | 1 | -11/+19 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | update tox.ini to cover 292 succeeding tests | ||||
| | * | | | | | | | | update tox.ini to cover 292 succeeding tests | Krombel | 2018-06-05 | 1 | -11/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-Off-By: Matthias Kesler <krombel@krombel.de> | ||||
| * | | | | | | | | | Merge pull request #3348 from intelfx/fix-sortedcontainers | Amber Brown | 2018-06-06 | 1 | -27/+22 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDict | ||||
| | * | | | | | | | | | federation/send_queue.py: fix usage of sortedcontainers.SortedDict | Ivan Shapovalov | 2018-06-06 | 1 | -27/+22 |
| | |/ / / / / / / / | |||||
| * / / / / / / / / | Fix metric documentation tables (#3341) | Amber Brown | 2018-06-06 | 1 | -20/+30 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #3327 from t3chguy/redact_as_request_token | Richard van der Hoff | 2018-06-05 | 3 | -9/+18 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Strip `access_token` from outgoing requests | ||||
| | * | | | | | | | 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 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3340 from ArchangeGabriel/patch-1 | Richard van der Hoff | 2018-06-05 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | doc/postgres.rst: fix display of the last command block | ||||
| | * | | | | | | | | doc/postgres.rest: fix displaying of the last command block | Bruno Pagani | 2018-06-04 | 1 | -9/+9 |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | Also indent all of them with 4 spaces. | ||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-06-05 | 1 | -0/+3 |
| |\| | | | | | | | |||||
| | * | | | | | | | Merge pull request #3290 from rubo77/patch-7 | Richard van der Hoff | 2018-05-30 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add link to thorough instruction how to configure consent | ||||
| | | * | | | | | | | remove trailing whitespace | Richard van der Hoff | 2018-05-30 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | fix english and wrap comment | Richard van der Hoff | 2018-05-30 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | add link to thorough instruction how to configure consent | Ruben Barkow | 2018-05-25 | 1 | -0/+2 |
| | |/ / / / / / / | |||||
| * | | | | / / / | Port to sortedcontainers (with tests!) (#3332) | Amber Brown | 2018-06-06 | 6 | -35/+241 |
| | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_method | Richard van der Hoff | 2018-06-04 | 1 | -26/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove was_forgotten_at | ||||
| | * | | | | | | | Remove was_forgotten_at | Richard van der Hoff | 2018-06-01 | 1 | -26/+0 |
| | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unused. IT MUST DIE!!!1 ̧̪͈̱̹̳͖͙H̵̰̤̰͕̖e̛ ͚͉̗̼̞w̶̩̥͉̮h̩̺̪̩͘ͅọ͎͉̟ ̜̩͔̦̘ͅW̪̫̩̣̲͔̳a͏͔̳͖i͖͜t͓̤̠͓͙s̘̰̩̥̙̝ͅ ̲̠̬̥Be̡̙̫̦h̰̩i̛̫͙͔̭̤̗̲n̳͞d̸ ͎̻͘T̛͇̝̲̹̠̗ͅh̫̦̝ͅe̩̫͟ ͓͖̼W͕̳͎͚̙̥ą̙l̘͚̺͔͞ͅl̳͍̙̤̤̮̳.̢ ̟̺̜̙͉Z̤̲̙̙͎̥̝A͎̣͔̙͘L̥̻̗̳̻̳̳͢G͉̖̯͓̞̩̦O̹̹̺!̙͈͎̞̬ * | ||||
| * | | | | | | | Merge pull request #3334 from matrix-org/rav/cache_factor_override | Richard van der Hoff | 2018-06-04 | 4 | -4/+18 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Cache factor override system for specific caches | ||||
| | * | | | | | | Add hacky cache factor override system | Erik Johnston | 2018-06-04 | 4 | -4/+18 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Fix replication metrics | Richard van der Hoff | 2018-06-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | fix bug introduced in #3256 | ||||
| * | | | | | | Hopefully, fix LaterGuage error handling | Richard van der Hoff | 2018-06-04 | 1 | -3/+6 |
| |/ / / / / | |||||
| * | | | | | Put python's logs into Trial when running unit tests (#3319) | Amber Brown | 2018-06-04 | 1 | -13/+27 |
| | | | | | | |||||
| * | | | | | Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usage | Amber Brown | 2018-06-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | federation: fix LaterGauge usage | ||||
| | * | | | | federation/send_queue.py: fix usage of LaterGauge | Ivan Shapovalov | 2018-06-03 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | Fixes a startup crash due to commit df9f72d9e5fe264b86005208e0f096156eb03e4b "replacing portions". | ||||
| * | | | | Merge pull request #3317 from ↵ | Richard van der Hoff | 2018-06-01 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | thegcat/feature/3312-add_ipv6_to_blacklist_example_config Add private IPv6 addresses to example config for url preview blacklist | ||||
| | * | | | | Add private IPv6 addresses to preview blacklist #3312 | Felix Schäfer | 2018-06-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The added addresses are expected to be local or loopback addresses and shouldn't be spidered for previews. Signed-off-by: Felix Schäfer <felix@thegcat.net> | ||||
| * | | | | | Merge pull request #3264 from matrix-org/neil/sign-up-stats | Neil Johnson | 2018-06-01 | 4 | -1/+60 |
| |\ \ \ \ \ | | | | | | | | | | | | | daily user type phone home stats | ||||
| | * | | | | | remove unnecessary INSERT | Neil Johnson | 2018-06-01 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | create users index on creation_ts | Neil Johnson | 2018-05-29 | 1 | -0/+20 |
| | | | | | | | |||||
| | * | | | | | create index in background | Neil Johnson | 2018-05-29 | 1 | -0/+7 |
| | | | | | | | |||||
| | * | | | | | bump version | Neil Johnson | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | daily user type phone home stats | Neil Johnson | 2018-05-22 | 2 | -0/+33 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3318 from matrix-org/rav/ignore_depth_on_rrs | Richard van der Hoff | 2018-06-01 | 1 | -29/+30 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Ignore depth when updating read-receipts | ||||
| | * | | | | | Handle RRs which arrive before their events | Richard van der Hoff | 2018-06-01 | 1 | -25/+19 |
| | | | | | | | |||||
| | * | | | | | Ignore depth when updating read-receipts | Richard van der Hoff | 2018-06-01 | 1 | -30/+37 |
| |/ / / / / | | | | | | | | | | | | | | | | Order read receipts by stream ordering instead of depth | ||||
| * | | | | | code_style.rst: formatting | Richard van der Hoff | 2018-05-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 16 | -26/+192 |
| | | | | | | |||||
| * | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 29 | -101/+116 |
| | | | | | | | | | | | | | | | | | | | | | they're not meant to be lazy (#3307) | ||||
| * | | | | | Merge pull request #3303 from NotAFile/py3-memoryview | Amber Brown | 2018-05-30 | 3 | -6/+30 |
| |\ \ \ \ \ | | | | | | | | | | | | | use memoryview in py3 | ||||
| | * | | | | | add remaining memoryview changes | Adrian Tschira | 2018-05-29 | 2 | -4/+12 |
| | | | | | | | |||||
| | * | | | | | use memoryview in py3 | Adrian Tschira | 2018-05-29 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | Merge pull request #3281 from NotAFile/py3-six-isinstance | Amber Brown | 2018-05-30 | 3 | -13/+18 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | remaining isintance fixes | ||||
| | * | | | | | | pep8 | Adrian Tschira | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | fix recursion error | Adrian Tschira | 2018-05-24 | 1 | -7/+5 |
| | | | | | | | | |||||
| | * | | | | | | remaining isintance fixes | Adrian Tschira | 2018-05-24 | 3 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | | Update some comments and docstrings in SyncHandler | Richard van der Hoff | 2018-05-29 | 1 | -1/+11 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr | Richard van der Hoff | 2018-05-29 | 3 | -0/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Exempt AS-registered users from doing gdpr | ||||
| | * | | | | | | | fix tests | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 2 | -0/+4 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #3302 from krombel/py3_extend_tox_testing | Richard van der Hoff | 2018-05-29 | 1 | -1/+28 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | extend tox testing for py3 to avoid regressions | ||||
| | * | | | | | | extend tox testing for py3 to avoid regressions | Krombel | 2018-05-29 | 1 | -1/+28 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #3299 from matrix-org/matthew/macos-fixes | Amber Brown | 2018-05-29 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | disable CPUMetrics if no /proc/self/stat | ||||
| | * | | | | | | pep8 | Matthew Hodgson | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | disable CPUMetrics if no /proc/self/stat | Matthew Hodgson | 2018-05-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build on macOS again | ||||
| * | | | | | | | fix another dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3256 from matrix-org/3218-official-prom | Amber Brown | 2018-05-28 | 40 | -1311/+575 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Switch to the Python Prometheus library | ||||
| | * | | | | | | fix up tests | Amber Brown | 2018-05-28 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | update to more consistently use seconds in any metrics or logging | Amber Brown | 2018-05-28 | 4 | -38/+38 |
| | | | | | | | | |||||
| | * | | | | | | invalid syntax :( | Amber Brown | 2018-05-28 | 1 | -2/+1 |
| | | | | | | | | |||||
| | * | | | | | | add comment about why unreg | Amber Brown | 2018-05-28 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | update metrics to be in seconds | Amber Brown | 2018-05-28 | 4 | -37/+38 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 47 | -197/+686 |
| | |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3288 from matrix-org/rav/no_spam_guests | Richard van der Hoff | 2018-05-25 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Avoid sending consent notice to guest users | ||||
| | * | | | | | | | Fix default for send_server_notice_to_guests | Richard van der Hoff | 2018-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bool("False") == True... | ||||
| | * | | | | | | | Avoid sending consent notice to guest users | Richard van der Hoff | 2018-05-25 | 2 | -1/+12 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | we think it makes sense not to send the notices to guest users. | ||||
| * | | | | | | | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room | Richard van der Hoff | 2018-05-25 | 2 | -12/+19 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Let users leave the server notice room after joining | ||||
| | * | | | | | | | Let users leave the server notice room after joining | Richard van der Hoff | 2018-05-25 | 2 | -12/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They still can't reject invites, but we let them leave it. | ||||
| * | | | | | | | | Merge pull request #3283 from NotAFile/py3-state | Amber Brown | 2018-05-24 | 1 | -23/+25 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | py3-ize state.py | ||||
| | * | | | | | | | | py3-ize state.py | Adrian Tschira | 2018-05-24 | 1 | -23/+25 |
| | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3279 from NotAFile/py3-more-iteritems | Amber Brown | 2018-05-24 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | more six iteritems | ||||
| | * | | | | | | | | more iteritems | Adrian Tschira | 2018-05-24 | 1 | -4/+6 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #3280 from NotAFile/py3-more-misc | Amber Brown | 2018-05-24 | 5 | -11/+13 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | More Misc. py3 fixes | ||||
| | * | | | | | | | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 5 | -11/+13 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | | Merge pull request #3278 from NotAFile/py3-storage-base | Amber Brown | 2018-05-24 | 1 | -17/+22 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Py3 storage/_base.py | ||||
| | * | | | | | | | Py3 storage/_base.py | Adrian Tschira | 2018-05-24 | 1 | -17/+22 |
| | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 15 | -49/+69 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | replace some iteritems with six | ||||
| | * | | | | | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 15 | -49/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | | | Merge pull request #3246 from NotAFile/py3-repr-string | Amber Brown | 2018-05-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | use repr, not str | ||||
| | * | | | | | | | | use repr, not str | Adrian Tschira | 2018-05-19 | 1 | -1/+1 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |