Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | clarify readme a bit more | Matthew Hodgson | 2015-06-27 | 1 | -1/+4 |
| | |||||
* | Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 v0.9.2-r2 | Erik Johnston | 2015-06-15 | 3 | -1/+7 |
|\ | | | | | Hotfixes v0.9.2-r2 | ||||
| * | Changelog | Erik Johnston | 2015-06-15 | 1 | -0/+5 |
| | | |||||
| * | Bump version | Erik Johnston | 2015-06-15 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2 | Erik Johnston | 2015-06-15 | 3 | -5/+6 |
| |\ | |/ |/| | |||||
* | | Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 v0.9.2-r1 | Erik Johnston | 2015-06-13 | 2 | -1/+2 |
|\ \ | | | | | | | Hotfixes v0.9.2-r1 | ||||
| * | | Bump version | Erik Johnston | 2015-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py | Erik Johnston | 2015-06-13 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'release-v0.9.2' v0.9.2 | Erik Johnston | 2015-06-12 | 33 | -281/+547 |
|\ \ | |||||
| * | | Mention config option name | Erik Johnston | 2015-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | s/some/certain | Erik Johnston | 2015-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | Update change log | Erik Johnston | 2015-06-12 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse v0.9.1 | Erik Johnston | 2015-05-26 | 64 | -1280/+2527 |
|\ \ \ | |||||
| | | * | Merge pull request #183 from intelfx/install-python-schema-deltas | Matthew Hodgson | 2015-06-13 | 1 | -0/+1 |
| | | |\ | | | | | | | | | | | MANIFEST.in: include python schema delta scripts | ||||
| | | | * | MANIFEST.in: include python schema delta scripts (we now have one in 20/) | Ivan Shapovalov | 2015-06-13 | 1 | -0/+1 |
| | | |/ | |||||
| | | * | Merge branch 'release-v0.9.2' into develop | Erik Johnston | 2015-06-11 | 3 | -2/+25 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | Update change log | Erik Johnston | 2015-06-11 | 1 | -0/+23 |
| | | | | |||||
| | * | | Bump schema version | Erik Johnston | 2015-06-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Bump version | Erik Johnston | 2015-06-11 | 1 | -1/+1 |
| | |/ | |||||
| | * | Catch any exceptions in the pusher loop. Use a lower timeout for pushers so ↵ | David Baker | 2015-06-05 | 1 | -112/+133 |
| | | | | | | | | | | | | we can see if they're actually still running. | ||||
| | * | pep8 | David Baker | 2015-06-04 | 1 | -1/+0 |
| | | | |||||
| | * | Add script to (re)convert the pushers table to changing the unique key. Also ↵ | David Baker | 2015-06-04 | 3 | -2/+79 |
| | | | | | | | | | | | | give the python db upgrade scripts the database engine so they can convert parameter strings, and add *args **kwargs to the upgrade function so we can add more args in future and previous scripts will ignore them. | ||||
| | * | Merge pull request #175 from matrix-org/erikj/thumbnail_thread | Erik Johnston | 2015-06-03 | 1 | -45/+53 |
| | |\ | | | | | | | | | Thumbnail images on a seperate thread | ||||
| | | * | Thumbnail images on a seperate thread | Erik Johnston | 2015-06-02 | 1 | -45/+53 |
| | | | | |||||
| | * | | Merge pull request #176 from matrix-org/erikj/backfill_auth | Erik Johnston | 2015-06-03 | 2 | -8/+50 |
| | |\ \ | | | | | | | | | | | Improve backfill. | ||||
| | | * | | Rephrase log line | Erik Johnston | 2015-06-02 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Don't about JSON when warning about content tampering | Erik Johnston | 2015-06-02 | 1 | -7/+4 |
| | | | | | |||||
| | | * | | Add a timeout | Erik Johnston | 2015-06-02 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Handle the fact we might be missing auth events | Erik Johnston | 2015-06-02 | 1 | -15/+19 |
| | | | | | |||||
| | | * | | Add some logging | Erik Johnston | 2015-06-02 | 1 | -0/+5 |
| | | | | | |||||
| | | * | | Correctly look up auth_events | Erik Johnston | 2015-06-02 | 1 | -9/+12 |
| | | | | | |||||
| | | * | | Don't process events we've already processed. Remember to process state events | Erik Johnston | 2015-06-02 | 1 | -0/+22 |
| | | | | | |||||
| | | * | | Correctly pass in auth_events | Erik Johnston | 2015-06-01 | 1 | -1/+11 |
| | | |/ | |||||
| | * | | Merge pull request #180 from matrix-org/erikj/prev_state_context | Erik Johnston | 2015-06-03 | 3 | -5/+5 |
| | |\ \ | | | | | | | | | | | Don't needlessly compute prev_state | ||||
| | | * | | Don't needlessly compute prev_state | Erik Johnston | 2015-06-03 | 3 | -5/+5 |
| | | | | | |||||
| | * | | | Merge pull request #179 from matrix-org/erikj/state_group_outliers | Erik Johnston | 2015-06-03 | 3 | -6/+22 |
| | |\ \ \ | | | | | | | | | | | | | Don't compute EventContext for outliers. | ||||
| | | * | | | Comment | Erik Johnston | 2015-06-03 | 1 | -0/+3 |
| | | | | | | |||||
| | | * | | | Don't needlessly compute context | Erik Johnston | 2015-06-03 | 3 | -6/+19 |
| | | |/ / | |||||
| | * | | | Merge pull request #178 from matrix-org/erikj/cache_state_groups | Erik Johnston | 2015-06-03 | 4 | -58/+93 |
| | |\ \ \ | | | | | | | | | | | | | Add cache to get_state_groups. | ||||
| | | * | | | Add cache to get_state_groups | Erik Johnston | 2015-06-03 | 1 | -8/+12 |
| | | | | | | |||||
| | | * | | | Caches should be bound to instances. | Erik Johnston | 2015-06-03 | 3 | -50/+81 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | Before, caches were global and so different instances of the stores would share caches. This caused problems in the unit tests. | ||||
| | * | | | Merge pull request #177 from matrix-org/erikj/content_repo_http_client | Erik Johnston | 2015-06-03 | 1 | -1/+2 |
| | |\ \ \ | | | | | | | | | | | | | SYN-403: Make content repository use its own http client. | ||||
| | | * | | | SYN-403: Make content repository use its own http client. | Erik Johnston | 2015-06-03 | 1 | -1/+2 |
| | | |/ / | |||||
| | * | | | Merge pull request #174 from matrix-org/erikj/compress_option | Erik Johnston | 2015-06-03 | 2 | -2/+14 |
| | |\ \ \ | | | |/ / | | |/| | | Add config option to disable compression of http responses | ||||
| | | * | | Add config option to disable compression of http responses | Erik Johnston | 2015-06-01 | 2 | -2/+14 |
| | | | | | |||||
| | * | | | Log where a request came from in federation | Erik Johnston | 2015-06-02 | 1 | -0/+2 |
| | | |/ | | |/| | |||||
| | * | | Don't explode if we don't have the event | Erik Johnston | 2015-06-01 | 1 | -1/+3 |
| | |/ | |||||
| | * | Merge pull request #172 from intelfx/contrib-systemd | Erik Johnston | 2015-05-31 | 1 | -0/+2 |
| | |\ | | | | | | | | | contrib/systemd: log_config.yaml: do not disable existing loggers | ||||
| | | * | contrib/systemd: log_config.yaml: do not disable existing loggers | Ivan Shapovalov | 2015-05-31 | 1 | -0/+2 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | It turned out that merely configuring the root logger is not enough for "catch-all" semantics. The logging subsystem also needs to be told not to disable existing loggers (so that their messages will get propagated to handlers up the logging hierarchy, not just silently discarded). Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com> | ||||
| | * | Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 2 | -1/+5 |
| | |\ | | | | | | | | | Allow endpoint for verifying recaptcha to be configured | ||||
| | | * | Merge branch 'develop' into markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 5 | -16/+12 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py | ||||
| | | * | | Add config for setting the recaptcha verify api endpoint, so we can test it ↵ | Mark Haines | 2015-05-29 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | in sytest | ||||
| | * | | | Remove log line | Erik Johnston | 2015-05-29 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Don't copy twice | Erik Johnston | 2015-05-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #169 from matrix-org/erikj/ultrajson | Erik Johnston | 2015-05-29 | 8 | -20/+47 |
| | |\ \ \ | | | |_|/ | | |/| | | Use ultrajson when possible. Add option to turn off freezing of events. | ||||
| | | * | | Bump syutil version | Erik Johnston | 2015-05-29 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 8 | -17/+44 |
| | |/ / | | | | | | | | | | | | | ujson.loads | ||||
| | * | | SYN-395: Fix CAPTCHA, don't double decode json | Erik Johnston | 2015-05-28 | 1 | -2/+3 |
| | | | | |||||
| | * | | Correctly pass connection pool parameter | Erik Johnston | 2015-05-28 | 2 | -2/+2 |
| | | | | |||||
| | * | | Merge pull request #168 from matrix-org/erikj/conn_pool | Erik Johnston | 2015-05-28 | 2 | -4/+9 |
| | |\ \ | | | | | | | | | | | Make HTTP clients use connection pools. | ||||
| | | * | | Up maxPersistentPerHost count | Erik Johnston | 2015-05-28 | 2 | -0/+2 |
| | | | | | |||||
| | | * | | Add connection pooling to SimpleHttpClient | Erik Johnston | 2015-05-28 | 1 | -2/+4 |
| | | | | | |||||
| | | * | | Use connection pool for federation connections | Erik Johnston | 2015-05-28 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Merge pull request #167 from matrix-org/erikj/deep_copy_removal | Erik Johnston | 2015-05-28 | 1 | -11/+1 |
| | |\ \ \ | | | |/ / | | |/| | | Remove a deep copy | ||||
| | | * | | Unused import | Erik Johnston | 2015-05-28 | 1 | -2/+0 |
| | | | | | |||||
| | | * | | Remove a deep copy | Erik Johnston | 2015-05-28 | 1 | -9/+1 |
| | |/ / | |||||
| | * / | Registration should be disabled by default | Erik Johnston | 2015-05-28 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-26 | 4 | -3/+30 |
| | |\ | | |/ | |/| | |||||
| * | | changelog | Erik Johnston | 2015-05-26 | 1 | -2/+2 |
| | | | |||||
| * | | Iterate over the user_streams not the user_ids | Mark Haines | 2015-05-26 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'bugs/SYN-390' into release-v0.9.1 | Mark Haines | 2015-05-26 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Take a dict of the rule, not the rule list | Mark Haines | 2015-05-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | changelog | Erik Johnston | 2015-05-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | changelog | Erik Johnston | 2015-05-26 | 1 | -2/+4 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1 | Erik Johnston | 2015-05-26 | 1 | -4/+7 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge pull request #166 from matrix-org/bugs/SYN-390 | Mark Haines | 2015-05-26 | 1 | -4/+7 |
| | |\| | | | | | | | | | SYN-390: Don't modify the dictionary returned from the database here either | ||||
| | | * | SYN-390: Don't modify the dictionary returned from the database here either | Mark Haines | 2015-05-26 | 1 | -4/+7 |
| | | | | |||||
| * | | | changelog | Erik Johnston | 2015-05-26 | 1 | -0/+25 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
| |\| | | |||||
| | * | | Merge pull request #165 from matrix-org/bugs/SYN-390 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
| | |\| | | | | | | | | | SYN-390: Don't modify the dictionary returned from the data store | ||||
| | | * | SYN-390: Don't modify the dictionary returned from the data store | Mark Haines | 2015-05-26 | 1 | -5/+8 |
| |_|/ |/| | | |||||
| * | | Bump version | Erik Johnston | 2015-05-22 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #163 from matrix-org/markjh/presence_list_cache | Mark Haines | 2015-05-22 | 5 | -34/+65 |
| |\ | | | | | | | Add a cache for the presence list | ||||
| | * | Fix the presence tests | Mark Haines | 2015-05-22 | 3 | -17/+23 |
| | | | |||||
| | * | Add a cache for getting the presence list for a user | Mark Haines | 2015-05-22 | 2 | -17/+42 |
| | | | |||||
| * | | Merge pull request #164 from matrix-org/markjh/pusher_performance_2 | Mark Haines | 2015-05-22 | 1 | -1/+17 |
| |\ \ | | | | | | | | | Add a cache for get_push rules for user, fix cache invalidation | ||||
| | * | | Add a cache for get_push rules for user, fix cache invalidation | Mark Haines | 2015-05-22 | 1 | -1/+17 |
| | | | | |||||
| * | | | Merge pull request #162 from matrix-org/erikj/backfill_fixes | Mark Haines | 2015-05-22 | 3 | -94/+153 |
| |\ \ \ | | |_|/ | |/| | | backfill fixes | ||||
| | * | | Remove redundant for loop | Erik Johnston | 2015-05-22 | 1 | -3/+0 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-22 | 26 | -143/+258 |
| | |\ \ | | |/ / | |/| | | | | | | erikj/backfill_fixes | ||||
| * | | | Merge pull request #156 from matrix-org/erikj/join_perf | Mark Haines | 2015-05-22 | 6 | -41/+92 |
| |\ \ \ | | | | | | | | | | | Make joining #matrix:matrix.org over federation quicker | ||||
| | * | | | Add doc strings | Erik Johnston | 2015-05-22 | 3 | -0/+7 |
| | | | | | |||||
| * | | | | Merge pull request #159 from matrix-org/erikj/metrics_interface_config | Mark Haines | 2015-05-22 | 2 | -3/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Enable changing the interface the metrics listener binds to | ||||
| | * | | | | s/metric_interface/metric_bind_host/ | Erik Johnston | 2015-05-22 | 2 | -5/+5 |
| | | | | | | |||||
| | * | | | | Update log line | Erik Johnston | 2015-05-22 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | Enable changing the interface the metrics listener binds to | Erik Johnston | 2015-05-22 | 2 | -2/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #157 from matrix-org/markjh/presence_performance | Mark Haines | 2015-05-22 | 3 | -71/+108 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Improve presence performance in loadtest | ||||
| | * | | | | | Remove spurious TODO comment | Mark Haines | 2015-05-22 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Removed unused 'is_visible' method | Mark Haines | 2015-05-20 | 1 | -27/+0 |
| | | | | | | | |||||
| | * | | | | | Fix the presence tests | Mark Haines | 2015-05-20 | 2 | -10/+6 |
| | | | | | | | |||||
| | * | | | | | Clean up the presence_list checking logic a bit | Mark Haines | 2015-05-20 | 1 | -12/+9 |
| | | | | | | | |||||
| | * | | | | | Speed up the get_pagination_rows as well | Mark Haines | 2015-05-18 | 1 | -3/+17 |
| | | | | | | | |||||
| | * | | | | | Cache the most recent serial for each room | Mark Haines | 2015-05-18 | 1 | -6/+22 |
| | | | | | | | |||||
| | * | | | | | Move updating the serial and state of the presence cache into a single function | Mark Haines | 2015-05-18 | 1 | -17/+43 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'notifier_performance' into markjh/presence_performance | Mark Haines | 2015-05-18 | 13 | -160/+295 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add more doc string, reduce C+P boilerplate for getting room list | Mark Haines | 2015-05-18 | 1 | -6/+22 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #160 from matrix-org/markjh/appservice_performance | Mark Haines | 2015-05-22 | 3 | -20/+8 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make the appservice use 'users_in_room' rather than get_room_members … | ||||
| | * | | | | | | | Remove unused import | Mark Haines | 2015-05-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Make the appservice use 'users_in_room' rather than get_room_members since ↵ | Mark Haines | 2015-05-22 | 3 | -19/+7 |
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | it is cached | ||||
| * | | | | | | | Merge pull request #161 from matrix-org/erikj/txn_logging_fix | Mark Haines | 2015-05-22 | 2 | -11/+28 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Erikj/txn logging fix | ||||
| | * | | | | | | | Log origin and stats of incoming transactions | Erik Johnston | 2015-05-22 | 1 | -0/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Add txn_id to some log lines | Erik Johnston | 2015-05-22 | 1 | -6/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Log less lines at INFO level, but include more helpful information | Erik Johnston | 2015-05-22 | 1 | -6/+10 |
| |/ / / / / / / | |||||
| * | | | / / / | Invalidate the get_latest_event_ids_in_room cache when deleting from ↵ | Mark Haines | 2015-05-22 | 1 | -0/+1 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | event_forward_extremities | ||||
| * | | | | | | Revert register_new_matrix_user to use v1 api | Erik Johnston | 2015-05-22 | 1 | -2/+3 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-22 | 11 | -36/+93 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Changelog v0.9.0-r5 | Erik Johnston | 2015-05-21 | 1 | -0/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'hotfixes-v0.9.0-r5' of github.com:matrix-org/synapse | Erik Johnston | 2015-05-21 | 10 | -36/+87 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bump version | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'markjh/pusher_performance_master' of ↵ | Erik Johnston | 2015-05-21 | 9 | -35/+86 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into hotfixes-v0.9.0-r5 | ||||
| * | | | | | | Don't try to use a txn when not in one, remove spurious debug logging | Mark Haines | 2015-05-21 | 2 | -5/+1 |
| | | | | | | | |||||
| * | | | | | | Add caches for things requested by the pushers | Mark Haines | 2015-05-21 | 7 | -33/+44 |
| | | | | | | | |||||
| * | | | | | | Add a cache for get_current_state with state_key | Mark Haines | 2015-05-21 | 5 | -2/+46 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse v0.9.0-r4 | Erik Johnston | 2015-05-11 | 3 | -58/+55 |
|\ \ \ \ \ \ | |||||
| | | | | | * | Actually return something from lambda | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | | | * | Sort backfill events | Erik Johnston | 2015-05-21 | 1 | -1/+5 |
| | | | | | | | |||||
| | | | | | * | Remove dead code | Erik Johnston | 2015-05-21 | 1 | -5/+0 |
| | | | | | | | |||||
| | | | | | * | Only get non-state | Erik Johnston | 2015-05-21 | 1 | -1/+2 |
| | | | | | | | |||||
| | | | | | * | Skip events we've already seen | Erik Johnston | 2015-05-21 | 1 | -0/+3 |
| | | | | | | | |||||
| | | | | | * | Correctly prepopulate queue | Erik Johnston | 2015-05-21 | 1 | -2/+10 |
| | | | | | | | |||||
| | | | | | * | Don't prepopulate event_results | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | | | * | Don't readd things that are already in event_results | Erik Johnston | 2015-05-21 | 1 | -1/+2 |
| | | | | | | | |||||
| | | | | | * | PriorityQueue gives lowest first | Erik Johnston | 2015-05-21 | 1 | -2/+2 |
| | | | | | | | |||||
| | | | | | * | Correctly capture Queue.Empty exception | Erik Johnston | 2015-05-21 | 1 | -2/+5 |
| | | | | | | | |||||
| | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-21 | 2 | -1/+7 |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | | | | | | | | erikj/backfill_fixes | ||||
| | * | | | | | Oops, get_rooms_for_user returns a namedtuple, not a room_id | Mark Haines | 2015-05-21 | 2 | -1/+7 |
| | | | | | | | |||||
| | | | | | * | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-21 | 13 | -189/+581 |
| | | | | | |\ | | | | | | |/ | | | | | |/| | | | | | | | | erikj/backfill_fixes | ||||
| | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-21 | 13 | -189/+581 |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge pull request #155 from matrix-org/erikj/perf | Erik Johnston | 2015-05-21 | 13 | -189/+581 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Bulk and batch retrieval of events. | ||||
| | | * | | | | | s/for events/for requests for events/ | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | s/for events/for requests for events/ | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add comments | Erik Johnston | 2015-05-21 | 1 | -3/+14 |
| | | | | | | | | |||||
| | | * | | | | | Split up _get_events into defer and txn versions | Erik Johnston | 2015-05-20 | 1 | -24/+35 |
| | | | | | | | | |||||
| | | * | | | | | Make not return a deferred _get_event_from_row_txn | Erik Johnston | 2015-05-20 | 1 | -20/+5 |
| | | | | | | | | |||||
| | | * | | | | | PEP8 | Erik Johnston | 2015-05-20 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Split out _get_event_from_row back into defer and _txn version | Erik Johnston | 2015-05-20 | 1 | -11/+57 |
| | | | | | | | | |||||
| | | * | | | | | Comments and shuffle of functions | Erik Johnston | 2015-05-18 | 1 | -38/+42 |
| | | | | | | | | |||||
| | | * | | | | | Remove unused metric | Erik Johnston | 2015-05-18 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | * | | | | | Remove rejected events if we don't want rejected events | Erik Johnston | 2015-05-18 | 1 | -0/+3 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-18 | 9 | -277/+314 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/perf | ||||
| | | * | | | | | | Remove pointless newline | Erik Johnston | 2015-05-18 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | Newline, remove debug logging | Erik Johnston | 2015-05-18 | 3 | -4/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Remove debug logging | Erik Johnston | 2015-05-18 | 1 | -8/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | PEP8 | Erik Johnston | 2015-05-15 | 2 | -2/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Revert limiting of fetching, it didn't help perf. | Erik Johnston | 2015-05-15 | 1 | -9/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | init j | Erik Johnston | 2015-05-15 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Don't completely drain the list | Erik Johnston | 2015-05-15 | 1 | -2/+9 |
| | | | | | | | | | |||||
| | | * | | | | | | Don't fetch prev_content for current_state | Erik Johnston | 2015-05-15 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Err, defer.gatherResults ftw | Erik Johnston | 2015-05-15 | 1 | -21/+12 |
| | | | | | | | | | |||||
| | | * | | | | | | Make store.get_current_state fetch events asyncly | Erik Johnston | 2015-05-15 | 2 | -4/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | Remove more debug logging | Erik Johnston | 2015-05-15 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | Remove debug logging | Erik Johnston | 2015-05-15 | 1 | -11/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | preserve log context | Erik Johnston | 2015-05-15 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Add a wait | Erik Johnston | 2015-05-15 | 2 | -3/+12 |
| | | | | | | | | | |||||
| | | * | | | | | | Srsly. Don't use closures. Baaaaaad | Erik Johnston | 2015-05-15 | 1 | -10/+8 |
| | | | | | | | | | |||||
| | | * | | | | | | Correctly pass through params | Erik Johnston | 2015-05-15 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | Sort out error handling | Erik Johnston | 2015-05-15 | 1 | -25/+22 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix daedlock | Erik Johnston | 2015-05-15 | 7 | -84/+122 |
| | | | | | | | | | |||||
| | | * | | | | | | Remove race condition | Erik Johnston | 2015-05-14 | 4 | -96/+157 |
| | | | | | | | | | |||||
| | | * | | | | | | Call from right thread | Erik Johnston | 2015-05-14 | 1 | -1/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | Count and loop | Erik Johnston | 2015-05-14 | 2 | -37/+35 |
| | | | | | | | | | |||||
| | | * | | | | | | Don't start up more fetch_events | Erik Johnston | 2015-05-14 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Awful idea for speeding up fetching of events | Erik Johnston | 2015-05-14 | 3 | -40/+139 |
| | | | | | | | | | |||||
| | | * | | | | | | Turn off preemptive transactions | Erik Johnston | 2015-05-14 | 1 | -17/+7 |
| | | | | | | | | | |||||
| | | * | | | | | | PEP8 | Erik Johnston | 2015-05-14 | 1 | -2/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Move from _base to events | Erik Johnston | 2015-05-14 | 2 | -232/+247 |
| | | | | | | | | | |||||
| | | * | | | | | | Jump out early | Erik Johnston | 2015-05-14 | 1 | -0/+6 |
| | | | | | | | | | |||||
| | | * | | | | | | Actually, we probably want to run this in a transaction | Erik Johnston | 2015-05-14 | 1 | -15/+12 |
| | | | | | | | | | |||||
| | | * | | | | | | Preemptively jump into a transaction if we ask for get_prev_content | Erik Johnston | 2015-05-14 | 1 | -12/+22 |
| | | | | | | | | | |||||
| | | * | | | | | | loop -> gatherResults | Erik Johnston | 2015-05-14 | 1 | -10/+14 |
| | | | | | | | | | |||||
| | | * | | | | | | Err, we probably want a bigger limit | Erik Johnston | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Move fetching of events into their own transactions | Erik Johnston | 2015-05-14 | 4 | -53/+45 |
| | | | | | | | | | |||||
| | | * | | | | | | Refactor _get_events | Erik Johnston | 2015-05-14 | 3 | -253/+123 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/perf | Erik Johnston | 2015-05-14 | 3 | -3/+14 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Add index on events | Erik Johnston | 2015-05-13 | 2 | -1/+20 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Actually use async method | Erik Johnston | 2015-05-13 | 1 | -3/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fetch events from events_id in their own transactions | Erik Johnston | 2015-05-13 | 3 | -18/+168 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Typo | Erik Johnston | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Don't insert None | Erik Johnston | 2015-05-13 | 1 | -1/+4 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Don't return None | Erik Johnston | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Limit batch size | Erik Johnston | 2015-05-13 | 1 | -5/+10 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fetch events in bulk | Erik Johnston | 2015-05-13 | 2 | -34/+63 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Don't fetch redaction and rejection stuff for each event, so we can use ↵ | Erik Johnston | 2015-05-13 | 2 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index only scan | ||||
| | | * | | | | | | | Temp turn off checking for rejections and redactions | Erik Johnston | 2015-05-13 | 1 | -5/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | defer.gatherResults loop | Erik Johnston | 2015-05-13 | 1 | -1/+7 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Batch fetching of events for state groups | Erik Johnston | 2015-05-13 | 1 | -1/+24 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Load events for state group seperately | Erik Johnston | 2015-05-13 | 2 | -5/+11 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix _get_backfill_events to return events in the correct order | Erik Johnston | 2015-05-20 | 1 | -27/+28 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Actually fetch state for new backwards extremeties when backfilling. | Erik Johnston | 2015-05-20 | 2 | -62/+108 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Ensure event_results is a set | Erik Johnston | 2015-05-19 | 1 | -1/+1 |
| | | | | | | | |/ | |||||
| | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-19 | 0 | -0/+0 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Handle the case when things return empty but non none things | Erik Johnston | 2015-05-19 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't always hit get_server_verify_key_v1_direct | Erik Johnston | 2015-05-19 | 1 | -5/+10 |
| | | | | | | | | | |||||
| | | | | | | | * | Add None check | Erik Johnston | 2015-05-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | | | | | * | Fix event_backwards_extrem insertion to ignore outliers | Erik Johnston | 2015-05-19 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | | | | | | | * | Add a timeout param to get_event | Erik Johnston | 2015-05-19 | 4 | -16/+25 |
| | | | | | | | | | |||||
| | | | | | | | * | Handle the case when things return empty but non none things | Erik Johnston | 2015-05-19 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | | | | | | * | Don't apply new room join hack if depth > 5 | Erik Johnston | 2015-05-19 | 1 | -3/+6 |
| | | | | | | | | | |||||
| | | | | | | | * | Don't always hit get_server_verify_key_v1_direct | Erik Johnston | 2015-05-19 | 1 | -5/+10 |
| | | | | | | | | | |||||
| | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-19 | 2 | -3/+12 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Disable GZip encoding on static file resources as per comment | David Baker | 2015-05-19 | 1 | -1/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Add forgotten .items() | Erik Johnston | 2015-05-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix scripts-dev/convert_server_keys.py to have correct format | Erik Johnston | 2015-05-19 | 1 | -1/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | SYN-383: Actually, we expect this value to be a dict | Erik Johnston | 2015-05-19 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Revert accidental commit | Erik Johnston | 2015-05-19 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | | | | | | | * | SYN-383: Actually, we expect this value to be a dict | Erik Johnston | 2015-05-19 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-19 | 2 | -4/+4 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | SYN-383: Handle the fact the server might not have signed things | Erik Johnston | 2015-05-19 | 2 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't reuse var names | Erik Johnston | 2015-05-19 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | | | | | | * | Don't reuse var names | Erik Johnston | 2015-05-19 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-19 | 1 | -18/+18 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return | Erik Johnston | 2015-05-19 | 1 | -18/+18 |
| | | | | | | | | | |||||
| | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-19 | 14 | -161/+298 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | SYN-383: Extract the response list from 'server_keys' in the response JSON ↵ | Mark Haines | 2015-05-19 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as it might work better than iterating over the top level dict | ||||
| | * | | | | | | | Merge pull request #152 from matrix-org/notifier_performance | Mark Haines | 2015-05-18 | 13 | -160/+295 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | Notifier performance | ||||
| | | * | | | | | | Don't bother sorting by the room_stream_ids, it shouldn't matter which order ↵ | Mark Haines | 2015-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are notified in | ||||
| | | * | | | | | | Merge branch 'develop' into notifier_performance | Mark Haines | 2015-05-18 | 10 | -105/+279 |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | * | | | | | | Make sure the notifier stream token goes forward when it is updated. Sort ↵ | Mark Haines | 2015-05-18 | 2 | -4/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the pending events by the correct room_stream_id | ||||
| | | * | | | | | | Add some doc-strings to notifier | Mark Haines | 2015-05-14 | 1 | -19/+33 |
| | | | | | | | | | |||||
| | | * | | | | | | Use the current token when timing out a notifier, make sure the user_id is a ↵ | Mark Haines | 2015-05-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string in on_new_user_event | ||||
| | | * | | | | | | Merge branch 'notifier_unify' into notifier_performance | Mark Haines | 2015-05-14 | 4 | -21/+10 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix v2 sync, update the last_notified_ms only if there was an active listener | Mark Haines | 2015-05-14 | 2 | -6/+7 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix metric counter | Mark Haines | 2015-05-13 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Discard unused NotifierUserStreams | Mark Haines | 2015-05-13 | 3 | -16/+38 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Don't set a timer if there's already a result to return | Mark Haines | 2015-05-13 | 1 | -3/+10 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Don't bother checking for new events from a source if the stream token ↵ | Mark Haines | 2015-05-13 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hasn't advanced for that source | ||||
| | | * | | | | | | | Don't bother checking for updates if the stream token hasn't advanced for a user | Mark Haines | 2015-05-13 | 12 | -55/+123 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'notifier_unify' into notifier_performance | Mark Haines | 2015-05-12 | 28 | -306/+631 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/notifier.py | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'notifier_unify' into notifier_performance | Mark Haines | 2015-05-12 | 3 | -24/+28 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Add a NotifierUserStream to hold all the notification listeners for a user | Mark Haines | 2015-05-12 | 1 | -114/+116 |
| | | | | | | | | | | | | |||||
| | | | | | | | | | | * | Do work in parellel when joining a room | Erik Johnston | 2015-05-18 | 1 | -19/+50 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #154 from matrix-org/erikj/events_move | Mark Haines | 2015-05-18 | 2 | -155/+132 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | | | Move get_events functions to storage.events | ||||
| | | * | | | | | | | Move get_events functions to storage.events | Erik Johnston | 2015-05-18 | 2 | -155/+132 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge pull request #153 from matrix-org/markjh/presence_docstring | Mark Haines | 2015-05-15 | 3 | -97/+233 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add some doc strings for presence. | ||||
| | | * | | | | | | | More whitespace | Mark Haines | 2015-05-15 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Add some missed argument types, cleanup the whitespace a bit | Mark Haines | 2015-05-14 | 1 | -6/+17 |
| | | | | | | | | | | |||||
| | | * | | | | | | | More doc-strings | Mark Haines | 2015-05-14 | 1 | -39/+202 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Remove unused arguments and doc PresenceHandler.push_update_to_clients | Mark Haines | 2015-05-14 | 3 | -60/+21 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Support gzip encoding for client, client v2 and web client resources (SYN-176). | David Baker | 2015-05-14 | 1 | -5/+16 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Treat setting your display name to the empty string as removing it (SYN-186). | David Baker | 2015-05-14 | 1 | -0/+3 |
| | | | | | | | | |