Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Oops, get_rooms_for_user returns a namedtuple, not a room_id | Mark Haines | 2015-05-21 | 1 | -0/+1 |
| | | |||||
* | | 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 |
| | | | | | |||||
* | | | | | 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: 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 |
| | | | | | |||||
* | | | | | SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return | Erik Johnston | 2015-05-19 | 1 | -18/+18 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |
| | |/ / / | |/| | | | |||||
* | | | | | 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 |
| | |_|/ | |/| | | |||||
* / | | | 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 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 |
|/ / / | |||||
* | | | Bump version | Erik Johnston | 2015-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | Fix push rule bug: can't insert bool into small int column | Erik Johnston | 2015-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | Bump version | Erik Johnston | 2015-05-08 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump version | Erik Johnston | 2015-05-08 | 1 | -1/+1 |
| | | | |||||
* | | | Drop the old table not the new table | Mark Haines | 2015-05-08 | 1 | -1/+1 |
| | | | |||||
* | | | Rename unique constraint | Mark Haines | 2015-05-08 | 1 | -1/+1 |
| | | | |||||
* | | | Remove unsigned | Mark Haines | 2015-05-08 | 1 | -2/+2 |
| | | | |||||
* | | | Bump schema version | Mark Haines | 2015-05-08 | 1 | -1/+1 |
| | | | |||||
* | | | Make the timestamps in server_keys_json bigints | Mark Haines | 2015-05-08 | 1 | -0/+32 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-07 | 2 | -4/+4 |
|\| | |||||
| * | Bump syweb version | Erik Johnston | 2015-05-07 | 1 | -3/+3 |
| | | |||||
| * | Bump version | Erik Johnston | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | revert accidental bcrypt gensalt round reduction from loadtesting | Mark Haines | 2015-05-07 | 1 | -1/+1 |
| | | |||||
* | | pynacl-0.3.0 was released so we can finally start using it directly from pypi | Mark Haines | 2015-05-07 | 2 | -7/+2 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2015-05-07 | 15 | -136/+261 |
|\ \ | |||||
| * | | Optional profiling using cProfile | Mark Haines | 2015-05-06 | 1 | -1/+21 |
| | | | |||||
| * | | Don't read from the config file before checking it exists | Mark Haines | 2015-05-06 | 1 | -9/+10 |
| |/ | |||||
| * | Merge branch 'erikj/executemany' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-05 | 8 | -48/+129 |
| |\ | | | | | | | | | | erikj/SYN-371 | ||||
| | * | And use buffer(...) there as well | Erik Johnston | 2015-05-05 | 2 | -2/+3 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany | Erik Johnston | 2015-05-05 | 8 | -46/+118 |
| | |\ | |||||
| | | * | Use buffer(...) when inserting into bytea column | Erik Johnston | 2015-05-05 | 2 | -4/+3 |
| | | | | |||||
| | | * | Merge pull request #139 from matrix-org/bugs/SYN-369 | Mark Haines | 2015-05-05 | 4 | -16/+80 |
| | | |\ | | | | | | | | | | | Fix race with cache invalidation. SYN-369 | ||||
| | | | * | Add some doc-string | Mark Haines | 2015-05-05 | 1 | -0/+4 |
| | | | | | |||||
| | | | * | Collect the invalidate callbacks on the transaction object rather than ↵ | Mark Haines | 2015-05-05 | 7 | -51/+51 |
| | | | | | | | | | | | | | | | | | | | | passing around a separate list | ||||
| | | | * | SYN-369: Add comments to the sequence number logic in the cache | Mark Haines | 2015-05-05 | 1 | -0/+7 |
| | | | | | |||||
| | | | * | Add debug flag in synapse/storage/_base.py for debugging the cache logic by ↵ | Mark Haines | 2015-05-05 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | comparing what is in the cache with what was in the database on every access | ||||
| | | | * | Invalidate the room_member cache if the current state events updates | Mark Haines | 2015-05-05 | 1 | -0/+5 |
| | | | | | |||||
| | | | * | Missing return for when the event was already persisted | Mark Haines | 2015-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Invalidate the caches from the correct thread | Mark Haines | 2015-05-05 | 6 | -29/+46 |
| | | | | | |||||
| | | | * | Sequence the modifications to the cache so that selects don't race with inserts | Mark Haines | 2015-05-05 | 1 | -3/+23 |
| | | | | | |||||
| | | * | | Fix the --help option for synapse | Mark Haines | 2015-05-05 | 1 | -18/+29 |
| | | | | | |||||
| | | * | | Missed events are not outliers | Erik Johnston | 2015-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add a comment about the zip(*[zip(sorted(...),...)]) | Erik Johnston | 2015-05-05 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Don't insert without deduplication. In this case we never actually use this ↵ | Erik Johnston | 2015-05-05 | 1 | -22/+0 |
| |/ / / | | | | | | | | | | | | | table, so simply remove the insert entirely | ||||
| * | | | Fix indentation | Erik Johnston | 2015-05-05 | 1 | -10/+10 |
| | | | | |||||
| * | | | Add support for using executemany | Erik Johnston | 2015-05-05 | 4 | -59/+97 |
| |/ / | |||||
| * / | Don't call 'encode_parameter' no-op | Erik Johnston | 2015-05-05 | 3 | -10/+0 |
| |/ | |||||
| * | Correctly name transaction | Erik Johnston | 2015-05-05 | 1 | -1/+1 |
| | | |||||
| * | Remove some unused indexes | Erik Johnston | 2015-05-01 | 1 | -0/+18 |
| | | |||||
| * | Don't log enqueue_ | Erik Johnston | 2015-05-01 | 1 | -1/+0 |
| | | |||||
* | | Typo | David Baker | 2015-05-07 | 1 | -1/+1 |
|/ | |||||
* | user_id now in user_threepids | David Baker | 2015-05-01 | 2 | -6/+6 |
| | |||||
* | That wasn't a deferred | Erik Johnston | 2015-05-01 | 2 | -4/+2 |
| | |||||
* | Remove inlineCallbacks from non-generator | Erik Johnston | 2015-05-01 | 1 | -2/+0 |
| | |||||
* | Typo | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | Remove some run_on_reactors | Erik Johnston | 2015-05-01 | 3 | -10/+0 |
| | |||||
* | Don't log all auth events every time we call auth.check | Erik Johnston | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | Use the daemonize key from the config if it exists | Mark Haines | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | Don't use self.execute: it's designed for fetching stuff | David Baker | 2015-05-01 | 1 | -3/+8 |
| | |||||
* | Merge pull request #136 from matrix-org/markjh/config_cleanup | Mark Haines | 2015-05-01 | 17 | -482/+559 |
|\ | | | | | Config restructuring. | ||||
| * | Allow generate-config to run against an existing config file to generate ↵ | Mark Haines | 2015-05-01 | 3 | -14/+26 |
| | | | | | | | | default keys | ||||
| * | Allow "manhole" to be ommited from the config | Mark Haines | 2015-04-30 | 1 | -1/+1 |
| | | |||||
| * | Remove the ~, comment the lines instead | Mark Haines | 2015-04-30 | 2 | -2/+2 |
| | | |||||
| * | Update key.py | Mark Haines | 2015-04-30 | 1 | -1/+2 |
| | | |||||
| * | Update metrics.py | Mark Haines | 2015-04-30 | 1 | -2/+2 |
| | | |||||
| * | missing import | Mark Haines | 2015-04-30 | 1 | -0/+2 |
| | | |||||
| * | read the pid_file from the config file in synctl | Mark Haines | 2015-04-30 | 1 | -2/+3 |
| | | |||||
| * | Merge branch 'develop' into markjh/config_cleanup | Mark Haines | 2015-04-30 | 16 | -88/+176 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/config/captcha.py | ||||
| * | | Write a default log_config when generating config | Mark Haines | 2015-04-30 | 4 | -4/+57 |
| | | | |||||
| * | | Don't break when sizes or durations are given as integers | Mark Haines | 2015-04-30 | 1 | -9/+12 |
| | | | |||||
| * | | Add a random string to the auto generated key id | Mark Haines | 2015-04-30 | 1 | -1/+3 |
| | | | |||||
| * | | Allow --enable-registration to be passed on the commandline | Mark Haines | 2015-04-30 | 1 | -3/+16 |
| | | | |||||
| * | | Use disable_registration keys if they are present | Mark Haines | 2015-04-30 | 1 | -0/+5 |
| | | | |||||
| * | | Allow multiple config files, set up a default config before applying the ↵ | Mark Haines | 2015-04-30 | 2 | -22/+38 |
| | | | | | | | | | | | | config files | ||||
| * | | remove duplicate parse_size method | Mark Haines | 2015-04-30 | 2 | -10/+0 |
| | | | |||||
| * | | Manually generate the default config yaml, remove most of the commandline ↵ | Mark Haines | 2015-04-30 | 16 | -464/+444 |
| | | | | | | | | | | | | arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class | ||||
* | | | No id field on user | David Baker | 2015-05-01 | 1 | -5/+1 |
| | | | |||||
* | | | More missed get_user_by_id API changes | David Baker | 2015-05-01 | 2 | -4/+4 |
| | | | |||||
* | | | One too many lens | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Change public room list to use defer.gatherResults | Erik Johnston | 2015-05-01 | 1 | -5/+13 |
| | | | |||||
* | | | This api now no longer returns an array | David Baker | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Don't wait for storage of access_token | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Cache latest_event_ids_in_room | Erik Johnston | 2015-05-01 | 1 | -1/+4 |
| | | | |||||
* | | | Don't lock user_ips table for upsert. | Erik Johnston | 2015-05-01 | 2 | -4/+10 |
| | | | |||||
* | | | Fix bug where we reconnected to the database on every query. | Erik Johnston | 2015-05-01 | 2 | -1/+2 |
| | | | |||||
* | | | Split a storage function in two so that we don't have to do extra work. | Erik Johnston | 2015-05-01 | 3 | -8/+14 |
| | | | |||||
* | | | Remove pointless join | Erik Johnston | 2015-04-30 | 1 | -5/+4 |
| | | | |||||
* | | | Fix broken SQL | Erik Johnston | 2015-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | Need more yield | Erik Johnston | 2015-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | Add missing param | Erik Johnston | 2015-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | More join conditions | Erik Johnston | 2015-04-30 | 1 | -2/+6 |
| | | | |||||
* | | | Add more conditions on JOINs to make postgres go a little faster. | Erik Johnston | 2015-04-30 | 2 | -4/+6 |
| | | | |||||
* | | | Fix up get_current_state and get_room_name_and_aliases queries to parse ↵ | Erik Johnston | 2015-04-30 | 2 | -32/+30 |
| |/ |/| | | | | | events in transaction | ||||
* | | Add get_rooms_for_user cache | Erik Johnston | 2015-04-30 | 1 | -0/+2 |
| | | |||||
* | | Undo changes to logger config, ie. remove the access_log_file option: ↵ | David Baker | 2015-04-30 | 1 | -16/+0 |
| | | | | | | | | decision is to support this through log_config rather tan adding an option. | ||||
* | | Do access log using python's logging stuff, just under a separate logger name | David Baker | 2015-04-30 | 2 | -14/+39 |
| | | |||||
* | | Don't use sub queries, it makes postgres sad | Erik Johnston | 2015-04-30 | 1 | -11/+5 |
| | | |||||
* | | SYN-367: Use upsert rather than insert_or_replace | Mark Haines | 2015-04-30 | 1 | -2/+6 |
| | | |||||
* | | Don't needlessly join on state_events | Erik Johnston | 2015-04-30 | 2 | -6/+4 |
| | | |||||
* | | Add an access_log | David Baker | 2015-04-30 | 3 | -3/+29 |
| | | | | | | | | SYN-161 #resolve | ||||
* | | Unused import | David Baker | 2015-04-30 | 1 | -1/+1 |
| | | |||||
* | | Doesn't look like this is used anymore | David Baker | 2015-04-30 | 1 | -13/+0 |
| | | |||||
* | | Make simple query rather than long one and then throw away half the results | Erik Johnston | 2015-04-30 | 2 | -2/+11 |
| | | |||||
* | | Correctly decode, for sqlite and postgres, rows from pushers table | Erik Johnston | 2015-04-29 | 1 | -19/+24 |
| | | |||||
* | | pushkey' are also bytes. | Erik Johnston | 2015-04-29 | 1 | -8/+17 |
| | | |||||
* | | Typo | Erik Johnston | 2015-04-29 | 1 | -1/+1 |
| | | |||||
* | | Also remove yield from within lock in the other generator | Erik Johnston | 2015-04-29 | 1 | -8/+6 |
| | | |||||
* | | Fix deadlock in id_generators. No idea why this was an actual deadlock. | Erik Johnston | 2015-04-29 | 1 | -14/+16 |
| | | |||||
* | | Also log when we've started pushers | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
| | | |||||
* | | Revert previous | Erik Johnston | 2015-04-29 | 1 | -5/+1 |
| | | |||||
* | | Only start pushers when synapse has fully started | Erik Johnston | 2015-04-29 | 2 | -4/+5 |
| | | |||||
* | | Start pushers on reactor thread | Erik Johnston | 2015-04-29 | 1 | -0/+3 |
| | | |||||
* | | Actually return rows | Erik Johnston | 2015-04-29 | 1 | -0/+2 |
| | | |||||
* | | Typo, args wrong way round | Erik Johnston | 2015-04-29 | 1 | -4/+1 |
| | | |||||
* | | Decode buffers in same thread | Erik Johnston | 2015-04-29 | 1 | -13/+19 |
| | |