Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #185 from matrix-org/erikj/listeners_config | Erik Johnston | 2015-06-15 | 5 | -210/+327 |
|\ | | | | | Change listener config. | ||||
| * | Remove redundant newline | Erik Johnston | 2015-06-15 | 1 | -2/+1 |
| | | |||||
| * | Document listener config. Remove deprecated config options | Erik Johnston | 2015-06-15 | 2 | -36/+42 |
| | | |||||
| * | Add backwards compat support for metrics, manhole and webclient config options | Erik Johnston | 2015-06-12 | 3 | -16/+27 |
| | | |||||
| * | PEP8 | Erik Johnston | 2015-06-12 | 1 | -3/+3 |
| | | |||||
| * | Correctly handle x_forwaded listener option | Erik Johnston | 2015-06-12 | 3 | -14/+31 |
| | | |||||
| * | Use config.listeners | Erik Johnston | 2015-06-12 | 2 | -96/+168 |
| | | |||||
| * | Fix up create_resource_tree | Erik Johnston | 2015-06-12 | 1 | -104/+100 |
| | | |||||
| * | Begin changing the config format | Erik Johnston | 2015-06-11 | 1 | -8/+24 |
| | | |||||
* | | Bump version | Erik Johnston | 2015-06-15 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 | 2 | -5/+3 |
|\ \ | | | | | | | Don't needlessly compute prev_state | ||||
| * | | Don't needlessly compute prev_state | Erik Johnston | 2015-06-03 | 2 | -5/+3 |
| | | | |||||
* | | | Merge pull request #179 from matrix-org/erikj/state_group_outliers | Erik Johnston | 2015-06-03 | 2 | -4/+20 |
|\ \ \ | | | | | | | | | 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 | 2 | -4/+17 |
| |/ / | |||||
* | | | Merge pull request #178 from matrix-org/erikj/cache_state_groups | Erik Johnston | 2015-06-03 | 2 | -22/+43 |
|\ \ \ | | | | | | | | | 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 | 1 | -14/+31 |
| |/ / | | | | | | | | | | | | | 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 #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 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | 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 |
|/ | |||||
* | 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 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | 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 | 2 | -17/+42 |
|\ \ | | | | | | | Add a cache for the presence list | ||||
| * | | 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 |
| | | | | |||||
* | | | | 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 | 21 | -119/+240 |
|\ \ \ \ | | |/ / | |/| | | | | | | 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 | 1 | -61/+102 |
| |\ \ \ \ | | | | | | | | | | | | | 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 |
| | | | | | | |||||
| | * | | | | 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 | 8 | -143/+267 |
| | |\ \ \ \ | |||||
| | * | | | | | 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 | 2 | -8/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 2 | -7/+4 |
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | it is cached | ||||
| * | | | | | | 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 | ||||
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-22 | 10 | -36/+87 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bump version | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | 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 |
| | | | | | | |||||
* | | | | | | 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 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | erikj/backfill_fixes | ||||
| * | | | | | Oops, get_rooms_for_user returns a namedtuple, not a room_id | Mark Haines | 2015-05-21 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-21 | 12 | -188/+579 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | erikj/backfill_fixes | ||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-21 | 12 | -188/+579 |
| |\| | | | | |||||
| | * | | | | Merge pull request #155 from matrix-org/erikj/perf | Erik Johnston | 2015-05-21 | 12 | -188/+579 |
| | |\ \ \ \ | | | | | | | | | | | | | | | 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 | 7 | -229/+301 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -83/+120 |
| | | | | | | | | |||||
| | | * | | | | | 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 | 2 | -2/+13 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | 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 |
| | | | | | | | | | |||||
| | * | | | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |
|/ / / / / / / / | |||||
* | | | | | | | | 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 | 1 | -2/+8 |
|\| | | | | | | | |||||
| * | | | | | | | Disable GZip encoding on static file resources as per comment | David Baker | 2015-05-19 | 1 | -1/+7 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 9 | -144/+270 |
|\| | | | | | | | |||||
| * | | | | | | | 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 | 8 | -143/+267 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | 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 | 8 | -57/+266 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | 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 | 3 | -20/+9 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | 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 | 1 | -16/+34 |
| | | | | | | | | |||||
| | * | | | | | | 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 | 7 | -38/+99 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'notifier_unify' into notifier_performance | Mark Haines | 2015-05-12 | 27 | -306/+630 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
|/ / / / / / / / / | |||||
* | | | | / / / / | 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 | 1 | -49/+220 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | 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 | 1 | -12/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #150 from matrix-org/notifier_unify | Mark Haines | 2015-05-14 | 1 | -174/+48 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Make v1 and v2 client APIs interact with the notifier in the same way. | ||||
| * | | | | | | | Merge branch 'develop' into notifier_unify | Mark Haines | 2015-05-14 | 3 | -20/+9 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'develop' into notifier_unify | Mark Haines | 2015-05-12 | 27 | -306/+630 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: synapse/notifier.py | ||||
| * | | | | | | Update the end_token correctly, otherwise the token doesn't advance and the ↵ | Mark Haines | 2015-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | client gets duplicate events | ||||
| * | | | | | | Merge branch 'develop' into notifier_unify | Mark Haines | 2015-05-12 | 2 | -23/+27 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Don't bother passing the events to the notifier since it isn't using them | Mark Haines | 2015-05-11 | 1 | -95/+18 |
| | | | | | | | |||||
| * | | | | | | Use wait_for_events to implement 'get_events' | Mark Haines | 2015-05-11 | 1 | -79/+30 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Disallow whitespace in aliases here too | David Baker | 2015-05-14 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Throw error when creating room if alias contains whitespace #SYN-335 | David Baker | 2015-05-14 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Make shared secret registration work again | David Baker | 2015-05-14 | 1 | -1/+4 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Add ID generator for push_rules_enable to #resolve SYN-378 | David Baker | 2015-05-14 | 2 | -2/+13 |
| |_|_|/ |/| | | | |||||
* | | | | Don't talk to yourself when backfilling | Erik Johnston | 2015-05-12 | 1 | -0/+2 |
| | | | | |||||
* | | | | You need to call contextmanager | Erik Johnston | 2015-05-12 | 1 | -0/+1 |
| | | | | |||||
* | | | | Revert "Improvement to performance of presence event stream handling" | Mark Haines | 2015-05-12 | 1 | -20/+6 |
| |_|/ |/| | | |||||
* | | | Merge pull request #143 from matrix-org/erikj/SYN-375 | Mark Haines | 2015-05-12 | 3 | -16/+60 |
|\ \ \ | | | | | | | | | SYN-375 - Lots of unhandled deferred exceptions. | ||||
| * | | | Change the way we create observers to deferreds so that we don't get spammed ↵ | Erik Johnston | 2015-05-08 | 3 | -16/+60 |
| | | | | | | | | | | | | | | | | by 'unhandled errors' | ||||
* | | | | Merge pull request #147 from matrix-org/presence-performance | Mark Haines | 2015-05-12 | 1 | -6/+20 |
|\ \ \ \ | | | | | | | | | | | Improvement to performance of presence event stream handling | ||||
| * | | | | Use the presence cachemap ordering to early-abort the iteration loop | Paul "LeoNerd" Evans | 2015-05-07 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Store presence cachemap in an ordered dict, so that the newer serials will ↵ | Paul "LeoNerd" Evans | 2015-05-07 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | be at the end | ||||
* | | | | | Merge pull request #144 from matrix-org/erikj/logging_context | Mark Haines | 2015-05-12 | 20 | -156/+238 |
|\ \ \ \ \ | | | | | | | | | | | | | Preserving logging contexts | ||||
| * | | | | | Make distributer.fire work as it did | Erik Johnston | 2015-05-12 | 1 | -20/+30 |
| | | | | | | |||||
| * | | | | | Unwrap defer.gatherResults failures | Erik Johnston | 2015-05-12 | 6 | -7/+18 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-12 | 7 | -83/+116 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | erikj/logging_context | ||||
| * | | | | | Fix up leak. Add warnings. | Erik Johnston | 2015-05-08 | 8 | -49/+70 |
| | | | | | | |||||
| * | | | | | Add some docs | Erik Johnston | 2015-05-08 | 1 | -2/+14 |
| | | | | | | |||||
| * | | | | | PEP8 | Erik Johnston | 2015-05-08 | 2 | -4/+2 |
| | | | | | | |||||
| * | | | | | Change the way we do logging contexts so that they survive divergences | Erik Johnston | 2015-05-08 | 12 | -100/+130 |
| | |/ / / | |/| | | |