Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 | 4 | -21/+10 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' into notifier_unify | Mark Haines | 2015-05-12 | 28 | -306/+631 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Specify python 2.7 in the virtualenv setup (SYN-319) #resolved | David Baker | 2015-05-14 | 1 | -1/+1 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | 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 |
| | | | | | | |||||
* | | | | | | Merge pull request #151 from matrix-org/revert-147-presence-performance | Mark Haines | 2015-05-12 | 1 | -20/+6 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Revert "Improvement to performance of presence event stream handling" | ||||
| * | | | | | 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 | 21 | -156/+239 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 14 | -92/+244 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | 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 | 13 | -100/+131 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #149 from matrix-org/erikj/backfill | Mark Haines | 2015-05-12 | 8 | -126/+310 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Backfill support | ||||
| * | | | | | | Err, delete the right stuff | Erik Johnston | 2015-05-12 | 1 | -4/+5 |
| | | | | | | | |||||
| * | | | | | | Newlines | Erik Johnston | 2015-05-12 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | We do actually want to delete rows out of event_backward_extremities | Erik Johnston | 2015-05-12 | 1 | -4/+11 |
| | | | | | | | |||||
| * | | | | | | Fix up _handle_prev_events to not try to insert duplicate rows | Erik Johnston | 2015-05-12 | 1 | -23/+13 |
| | | | | | | | |||||
| * | | | | | | Do state groups persistence /after/ checking if we have already persisted ↵ | Erik Johnston | 2015-05-12 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the event | ||||
| * | | | | | | s/backfil/backfill/ | Erik Johnston | 2015-05-12 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Typos everywhere | Erik Johnston | 2015-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | And another typo. | Erik Johnston | 2015-05-12 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Err, gatherResults doesn't take a dict... | Erik Johnston | 2015-05-12 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Handle the case where the other side is unreachable when backfilling | Erik Johnston | 2015-05-12 | 1 | -14/+42 |
| | | | | | | | |||||
| * | | | | | | Make get_current_token accept a direction parameter, which tells whether the ↵ | Erik Johnston | 2015-05-12 | 4 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | source whether we want a token for going 'forwards' or 'backwards' | ||||
| * | | | | | | Initial hack at wiring together pagination and backfill | Erik Johnston | 2015-05-11 | 3 | -5/+141 |
| | | | | | | | |||||
| * | | | | | | Move storage.stream._StreamToken to types.RoomStreamToken | Erik Johnston | 2015-05-11 | 2 | -85/+85 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #148 from matrix-org/bugs/SYN-377 | Mark Haines | 2015-05-12 | 2 | -23/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | SYN-377: Make sure that the event is marked as persisted from the main thread. | ||||
| * | | | | | SYN-377: Make sure that the StreamIdGenerator.get_next.__exit__ is called ↵ | Mark Haines | 2015-05-12 | 2 | -23/+27 |
|/ / / / / | | | | | | | | | | | | | | | | from the main thread after the transaction completes, not from database thread before the transaction completes. | ||||
* | | | | | Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-11 | 3 | -58/+55 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #146 from matrix-org/erikj/push_rules_fixes | Erik Johnston | 2015-05-11 | 2 | -57/+54 |
| |\ \ \ \ | | | | | | | | | | | | | Fix 500 on push rule updates. | ||||
| | * | | | | Prefer to use _simple_*. | Erik Johnston | 2015-05-11 | 1 | -44/+41 |
| | | | | | | |||||
| | * | | | | push_rules table expects an 'id' field | Erik Johnston | 2015-05-11 | 2 | -13/+13 |
| | | |_|/ | | |/| | | |||||
| * / | | | Bump version | Erik Johnston | 2015-05-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | SYN-376: Add script for converting server keys from v1 to v2 | Mark Haines | 2015-05-11 | 1 | -0/+113 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-10 | 3 | -3/+3 |
|\| | | | |_|/ |/| | |