Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add same user_id char checks as registration. | Kegan Dougal | 2015-03-31 | 1 | -1/+7 |
| | |||||
* | Use a sender localpart instead of a user ID. | Kegan Dougal | 2015-03-31 | 1 | -2/+9 |
| | | | | | Form the user ID at runtime instead, This gives less room for error in AS config files since they cannot specify the domain of another HS. | ||||
* | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests. | Kegan Dougal | 2015-03-31 | 2 | -13/+17 |
| | |||||
* | Fix tests and missing returns on deferreds. | Kegan Dougal | 2015-03-31 | 1 | -7/+11 |
| | |||||
* | Remove more reg/unreg methods. Read config not database for cache. | Kegan Dougal | 2015-03-31 | 1 | -160/+59 |
| | |||||
* | Revert "Add another @cached wrapper, this time on get_presence_state()" | Paul "LeoNerd" Evans | 2015-03-27 | 1 | -8/+2 |
| | | | | This reverts commit ff1fa0fbf80cbb636e4cce59846bb5dcc91ccd03. | ||||
* | Add another @cached wrapper, this time on get_presence_state() | Paul "LeoNerd" Evans | 2015-03-27 | 1 | -2/+8 |
| | |||||
* | Fixes from PR comments | Kegan Dougal | 2015-03-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-26 | 19 | -644/+795 |
|\ | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
| * | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -8/+12 |
| | | |||||
| * | Put a cache on get_aliases_for_room | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+8 |
| | | |||||
| * | Remember the 'last seen' time for a given user/IP/device combination and ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+30 |
| | | | | | | | | only bother INSERTing another if it's stale | ||||
| * | Pull out the cache logic from the @cached wrapper into its own class we can ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -35/+54 |
| | | | | | | | | reuse | ||||
| * | func(*EXPR) is valid Python syntax, really... | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -2/+1 |
| | | |||||
| * | PEP8 | Erik Johnston | 2015-03-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into store_rearrangement | Erik Johnston | 2015-03-20 | 3 | -14/+30 |
| |\ | |||||
| | * | Add the tiniest of tiny one-element caches to get_room_events_max_id() as ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 2 | -1/+3 |
| | | | | | | | | | | | | it's read every time someone hits eventstream | ||||
| | * | Allow @cached-wrapped functions to have more or fewer than 1 argument; ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -13/+27 |
| | | | | | | | | | | | | assert on the total count of them though | ||||
| * | | Give sensible names for '_simple_...' transactions | Erik Johnston | 2015-03-20 | 13 | -38/+93 |
| | | | |||||
| * | | Start removing Tables | Erik Johnston | 2015-03-20 | 2 | -26/+29 |
| | | | |||||
| * | | Tidy up _simple_... methods | Erik Johnston | 2015-03-20 | 2 | -40/+60 |
| | | | |||||
| * | | Rearrange storage modules | Erik Johnston | 2015-03-20 | 7 | -515/+493 |
| |/ | |||||
| * | Clean out event_forward_extremities table when the server rejoins the room | Erik Johnston | 2015-03-18 | 1 | -0/+12 |
| | | |||||
| * | @cached() annotate get_user_by_token() - achieves a minor DB performance ↵ | Paul "LeoNerd" Evans | 2015-03-17 | 1 | -1/+6 |
| | | | | | | | | improvement | ||||
| * | Be polite and ensure we use @functools.wraps() when creating a function ↵ | Paul "LeoNerd" Evans | 2015-03-17 | 1 | -0/+2 |
| | | | | | | | | decorator | ||||
| * | Add a metric for the scheduling latency of SQL queries | Paul "LeoNerd" Evans | 2015-03-16 | 1 | -0/+5 |
| | | |||||
| * | Merge pull request #110 from matrix-org/fix_ban | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| |\ | | | | | | | Fix ban | ||||
| | * | Copy dict of context.current_state before changing it. | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | Set the service ID as soon as it is known. | Kegan Dougal | 2015-03-16 | 1 | -3/+4 |
| | | | |||||
* | | | Minor PR comment tweaks. | Kegan Dougal | 2015-03-16 | 2 | -4/+4 |
| | | | |||||
* | | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-16 | 9 | -54/+83 |
|\| | | | | | | | | | | | | | | Conflicts: synapse/storage/appservice.py | ||||
| * | | Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -7/+5 |
| | | | | | | | | | | | | total time ever spent since boot | ||||
| * | | Rename the timer metrics exported by synapse.storage to append _time, so the ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | meaning of ':total' is clearer | ||||
| * | | Rename TimerMetric to DistributionMetric; as it could count more than just time | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -7/+7 |
| | | | |||||
| * | | Pretend the 'getEvent' cache is just another cache in the set of all the ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -6/+5 |
| | | | | | | | | | | | | others for metric | ||||
| * | | Use _ instead of . as a metric namespacing separator, for Prometheus | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+13 |
| | | | |||||
| * | | Rename Metrics' "keys" to "labels" | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+3 |
| | | | |||||
| * | | Add TimerMetrics to shadow the PerformanceCounters in synapse.storage; with ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+20 |
| | | | | | | | | | | | | the view to eventually replacing them entirely | ||||
| * | | Collect per-SQL-verb timer stats on query execution time | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+11 |
| | | | |||||
| * | | Delete a couple of TODO markers of monitoring stats now done | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+0 |
| | | | |||||
| * | | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | component to give the size of the cache | ||||
| * | | Sprinkle some CacheCounterMetrics around the synapse.storage layer | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+15 |
| | | | |||||
| * | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-11 | 1 | -2/+2 |
| | | | |||||
| * | | Also give _execute() a description | Paul "LeoNerd" Evans | 2015-03-11 | 6 | -12/+10 |
| | | | |||||
| * | | Add a description to storage layer's _execute_and_decode() | Paul "LeoNerd" Evans | 2015-03-11 | 5 | -6/+9 |
| | | | |||||
| * | | Add the master push rule for the break-my-push button. Allow server default ↵ | David Baker | 2015-03-10 | 1 | -22/+5 |
| | | | | | | | | | | | | rules to be disabled by default. | ||||
| * | | These aren't defined for redacted events so don't crash | David Baker | 2015-03-10 | 1 | -2/+4 |
| |/ | |||||
* | | Fix remaining scheduler bugs. Add more informative logging. | Kegan Dougal | 2015-03-10 | 1 | -2/+3 |
| | | |||||
* | | Remove unused import | Kegan Dougal | 2015-03-09 | 1 | -1/+0 |
| | | |||||
* | | Bug fixes whilst putting it all together | Kegan Dougal | 2015-03-09 | 1 | -5/+4 |
| | | |||||
* | | Use event IDs instead of dumping event content in the txns table. | Kegan Dougal | 2015-03-09 | 2 | -7/+9 |
| | | |||||
* | | Use seconds; start gluing in the AS scheduler into the AS handler. | Kegan Dougal | 2015-03-09 | 1 | -2/+5 |
| | | |||||
* | | Finish appservice txn storage impl and tests. | Kegan Dougal | 2015-03-09 | 2 | -16/+71 |
| | | |||||
* | | Implement create_appservice_txn with tests. | Kegan Dougal | 2015-03-09 | 1 | -4/+42 |
| | | |||||
* | | Partially implement txn store methods with tests. | Kegan Dougal | 2015-03-09 | 1 | -17/+44 |
| | | |||||
* | | Start implementing ApplicationServiceTransactionStore | Kegan Dougal | 2015-03-06 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-06 | 2 | -1/+56 |
|\| | |||||
| * | Schema change as delta in v14 | David Baker | 2015-03-06 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'develop' into pushrules2 | David Baker | 2015-03-04 | 29 | -606/+325 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/storage/schema/pusher.sql | ||||
| * \ | Merge branch 'develop' into pushrules2 | David Baker | 2015-03-04 | 6 | -33/+279 |
| |\ \ | |||||
| * | | | Use if not results rather than len, as per feedback. | David Baker | 2015-03-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | s/user_name/user/ as per mjark's comment | David Baker | 2015-03-02 | 1 | -3/+3 |
| | | | | |||||
| * | | | Blank lines | David Baker | 2015-03-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add API for getting/setting enabled-ness of push rules. | David Baker | 2015-02-26 | 1 | -0/+24 |
| | | | | |||||
| * | | | whitespace | David Baker | 2015-02-26 | 1 | -1/+2 |
| | | | | |||||
| * | | | Add enable/disable overlay for push rules (REST API not yet hooked up) | David Baker | 2015-02-25 | 3 | -0/+39 |
| | | | | |||||
* | | | | Assign the AS ID from the database; replace old placeholder txn id. | Kegan Dougal | 2015-03-06 | 1 | -2/+3 |
| | | | | |||||
* | | | | Add appservice txns sql schema | Kegan Dougal | 2015-03-06 | 3 | -1/+38 |
| | | | | |||||
* | | | | Apply clarity and docstrings | Kegan Dougal | 2015-03-06 | 1 | -1/+13 |
| | | | | |||||
* | | | | Finish synapse.appservice.scheduler implementation. | Kegan Dougal | 2015-03-06 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | With tests to assert behaviour. Not hooked up yet. Stub datastore methods not implemented yet. | ||||
* | | | | Flesh out more stub functions. | Kegan Dougal | 2015-03-06 | 1 | -2/+15 |
| | | | | |||||
* | | | | Add stub ApplicationServiceTransactionStore. Bootstrap Recoverers. Fill in ↵ | Kegan Dougal | 2015-03-06 | 1 | -0/+28 |
| |_|/ |/| | | | | | | | | stub Transaction functions. | ||||
* | | | Note that we don't specify execution order | Erik Johnston | 2015-03-04 | 1 | -0/+4 |
| | | | |||||
* | | | s/schema_deltas/applied_schema_deltas/ | Erik Johnston | 2015-03-04 | 2 | -9/+11 |
| | | | |||||
* | | | s/%r/%s/ | Erik Johnston | 2015-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | Add example directory structures in doc | Erik Johnston | 2015-03-04 | 1 | -1/+36 |
| | | | |||||
* | | | Don't assume db conn is a Context Manager. | Erik Johnston | 2015-03-04 | 1 | -1/+5 |
| | | | | | | | | | | | | Twisted adbapi wrapped connections aren't context managers. | ||||
* | | | Add unique constraint on schema_version.lock schema. Use conflict clause in sql. | Erik Johnston | 2015-03-04 | 2 | -4/+5 |
| | | | |||||
* | | | Change to use logger in db upgrade script | Erik Johnston | 2015-03-04 | 1 | -1/+4 |
| | | | |||||
* | | | Use context manager with db conn to correctly commit and rollback | Erik Johnston | 2015-03-04 | 1 | -11/+11 |
| | | | |||||
* | | | Actually add full_schemas dir | Erik Johnston | 2015-03-04 | 12 | -0/+645 |
| | | | |||||
* | | | More docs. Rename 'schema/current' to 'schema/full_schemas' | Erik Johnston | 2015-03-04 | 13 | -652/+23 |
| | | | |||||
* | | | Add some docs and remove unused variables | Erik Johnston | 2015-03-04 | 1 | -8/+10 |
| | | | |||||
* | | | SYN-67: Finish up implementing new database schema management | Erik Johnston | 2015-03-04 | 28 | -567/+161 |
| | | | |||||
* | | | SYN-67: Begin changing the way we handle schema versioning | Erik Johnston | 2015-03-02 | 1 | -38/+106 |
| |/ |/| | |||||
* | | Add missing comma | Erik Johnston | 2015-03-02 | 1 | -1/+1 |
| | | |||||
* | | We purposefully don't have a version 14 delta script. | Erik Johnston | 2015-03-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #93 from matrix-org/application-services-exclusive | Kegsay | 2015-03-02 | 2 | -4/+14 |
|\ \ | | | | | | | Application services exclusive flag support | ||||
| * | | Run deltas and bump user_version in upgrade script | Kegan Dougal | 2015-03-02 | 1 | -1/+1 |
| | | | |||||
| * | | Convert expected format for AS regex to include exclusivity. | Kegan Dougal | 2015-02-27 | 1 | -3/+13 |
| |/ | | | | | | | | | Previously you just specified the regex as a string, now it expects a JSON object with a 'regex' key and an 'exclusive' boolean, as per spec. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-03-02 | 5 | -91/+279 |
|\ \ | |||||
| * | | PEP8 | Kegan Dougal | 2015-03-02 | 1 | -1/+1 |
| | | | |||||
| * | | Wrap all of get_app_service_rooms in a txn. | Kegan Dougal | 2015-03-02 | 6 | -88/+67 |
| | | | |||||
| * | | JOIN state_events rather than parsing unrecognized_keys to pull out member ↵ | Kegan Dougal | 2015-03-02 | 2 | -11/+5 |
| | | | | | | | | | | | | state_keys | ||||
| * | | Modify _simple_select_list to allow an empty WHERE clause. Use it for ↵ | Kegan Dougal | 2015-03-02 | 4 | -17/+21 |
| | | | | | | | | | | | | get_all_rooms and get_all_users. | ||||
| * | | PR tweaks: set earlier on and use 'as json' for compat | Kegan Dougal | 2015-03-02 | 3 | -16/+12 |
| | | | |||||
| * | | PEP8 | Kegan Dougal | 2015-02-27 | 1 | -1/+0 |
| | | | |||||
| * | | Check for membership invite events correctly. | Kegan Dougal | 2015-02-26 | 1 | -2/+21 |
| | | | |||||
| * | | Finish impl to get new events for AS. ASes should now be able to poll /events | Kegan Dougal | 2015-02-26 | 1 | -7/+55 |
| | | | |||||
| * | | Finish impl to extract all room IDs an AS may be interested in when polling ↵ | Kegan Dougal | 2015-02-26 | 2 | -6/+36 |
| | | | | | | | | | | | | the event stream. | ||||
| * | | PEP8 and pyflakes | Kegan Dougal | 2015-02-25 | 2 | -6/+3 |
| | | | |||||
| * | | Comment unused variables. | Kegan Dougal | 2015-02-25 | 1 | -2/+2 |
| | | | |||||
| * | | Fix alias query. | Kegan Dougal | 2015-02-25 | 1 | -6/+5 |
| | | | |||||
| * | | Add support for extracting matching room_ids and room_aliases for a given AS. | Kegan Dougal | 2015-02-25 | 3 | -2/+82 |
| | | | |||||
| * | | Add stub functions and work out execution flow to implement AS event stream ↵ | Kegan Dougal | 2015-02-25 | 2 | -0/+40 |
| |/ | | | | | | | polling. | ||||
| * | Use OrderedDict for @cached backing store, so we can evict the oldest key ↵ | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -7/+4 |
| | | | | | | | | unbiased | ||||
| * | Use cache.pop() instead of a separate membership test + del [] | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -2/+1 |
| | | |||||
| * | Fix code style warning | Mark Haines | 2015-02-23 | 1 | -1/+1 |
| | | |||||
| * | Remove unused import | Mark Haines | 2015-02-23 | 1 | -2/+0 |
| | | |||||
| * | Pull the _get_event_cache.setdefault() call out of the try block, as it ↵ | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -1/+2 |
| | | | | | | | | doesn't need to be there and is confusing | ||||
| * | Use the @cached decorator to implement the destination_retry_timings cache | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -9/+5 |
| | | |||||
| * | RoomMemberStore no longer needs a _user_rooms_cache member | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -5/+0 |
| | | |||||
| * | Allow @cached-wrapped functions to have a prefill method for setting entries | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -8/+15 |
| | | |||||
| * | Squash out the now-redundant ApplicationServicesCache object class | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -20/+8 |
| | | |||||
| * | Remove a TODO note | Paul "LeoNerd" Evans | 2015-02-19 | 1 | -1/+0 |
| | | |||||
| * | Take named arguments to @cached() decorator, add a 'max_entries' limit | Paul "LeoNerd" Evans | 2015-02-19 | 2 | -16/+25 |
| | | |||||
| * | Move @cached decorator out into synapse.storage._base; add minimal docs | Paul "LeoNerd" Evans | 2015-02-19 | 2 | -27/+36 |
| | | |||||
| * | Pull out the 'get_rooms_for_user' cache logic into a reüsable @cached decorator | Paul "LeoNerd" Evans | 2015-02-19 | 1 | -24/+29 |
| | | |||||
* | | Revert get_auth_chain changes | Erik Johnston | 2015-02-23 | 1 | -7/+5 |
| | | |||||
* | | Initial stab at implementing a batched get_missing_pdus request | Erik Johnston | 2015-02-19 | 1 | -5/+58 |
|/ | |||||
* | Use absolute path when loading delta sql files | Erik Johnston | 2015-02-17 | 1 | -1/+2 |
| | |||||
* | Bump schema version | Erik Johnston | 2015-02-17 | 2 | -1/+1 |
| | |||||
* | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
|\ | |||||
| * | Use consumeErrors=True on all DeferredLists. | Erik Johnston | 2015-02-17 | 1 | -1/+1 |
| | | | | | | | | | | | | This is so that the DeferredLists actually consume the error instead of propogating down the non-existent errback chain. This should reduce the number of unhandled errors we are seeing. | ||||
* | | Merge branch 'hotfixes-0.7.0e' into develop | David Baker | 2015-02-13 | 1 | -6/+6 |
|\| | |||||
| * | Update pushers by app id and pushkey, not user id and pushkey | David Baker | 2015-02-13 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 4 | -0/+315 |
|\ \ | | | | | | | Application Services | ||||
| * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 3 | -22/+75 |
| |\ \ | |||||
| * | | | PEP8-ify | Kegan Dougal | 2015-02-11 | 1 | -3/+0 |
| | | | | |||||
| * | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 2 | -3/+70 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 3 | -24/+36 |
| |\ \ \ \ | |||||
| * | | | | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens) | ||||
| * | | | | | Register a user account for the AS when the AS registers. Add 'sender' ↵ | Kegan Dougal | 2015-02-09 | 3 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | column to AS table. | ||||
| * | | | | | Add delta sql file. | Kegan Dougal | 2015-02-05 | 1 | -0/+33 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -2/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 4 | -84/+145 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add hs_token column and generate a different token f.e application service. | Kegan Dougal | 2015-02-05 | 2 | -5/+13 |
| | | | | | | | | |||||
| * | | | | | | | Fix bug in store defer. Add more unit tests. | Kegan Dougal | 2015-02-04 | 1 | -4/+14 |
| | | | | | | | | |||||
| * | | | | | | | Add stub ApplicationServiceApi and glue it with the handler. | Kegan Dougal | 2015-02-04 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add appservice package and move ApplicationService into it. | Kegan Dougal | 2015-02-03 | 1 | -104/+1 |
| | | | | | | | | |||||
| * | | | | | | | Implement restricted namespace checks. Begin fleshing out the main hook for ↵ | Kegan Dougal | 2015-02-03 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifying application services. | ||||
| * | | | | | | | Add namespace constants. Add restrict_to option to limit namespace checks. | Kegan Dougal | 2015-02-03 | 1 | -17/+24 |
| | | | | | | | | |||||
| * | | | | | | | Everyone loves SQL typos | Kegan Dougal | 2015-02-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Implement regex checks for app services. | Kegan Dougal | 2015-02-03 | 1 | -27/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose handler.get_services_for_event which manages the checks for all services. | ||||
| * | | | | | | | Add defers in the right places. | Kegan Dougal | 2015-02-02 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Implement txns for AS (un)registration. | Kegan Dougal | 2015-02-02 | 2 | -22/+100 |
| | | | | | | | | |||||
| * | | | | | | | Actually merge into develop. | Kegan Dougal | 2015-02-02 | 1 | -8/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 13 | -29/+867 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵ | Kegan Dougal | 2015-01-28 | 3 | -11/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it. | ||||
| * | | | | | | | | Remove unused import | Kegan Dougal | 2015-01-28 | 1 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Log when ASes are registered/unregistered. | Kegan Dougal | 2015-01-27 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Use ApplicationService when registering. | Kegan Dougal | 2015-01-27 | 1 | -10/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add stub methods, TODOs and docstrings for application services. | Kegan Dougal | 2015-01-27 | 1 | -2/+50 |
| | | | | | | | | | |||||
| * | | | | | | | | Add AS specific classes with docstrings. | Kegan Dougal | 2015-01-27 | 1 | -1/+59 |
| | | | | | | | | | |||||
| * | | | | | | | | Add appservice handler and store. Glue together rest > handler > store. | Kegan Dougal | 2015-01-27 | 2 | -2/+48 |
| | | | | | | | | | |||||
* | | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so ↵ | Mark Haines | 2015-02-13 | 1 | -0/+3 |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | that in-memory databases will work | ||||
* | | | | | | | | Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a | Erik Johnston | 2015-02-12 | 1 | -7/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Get an auth query one at a time | Erik Johnston | 2015-02-12 | 1 | -7/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Set database schema version in delta | Erik Johnston | 2015-02-12 | 1 | -0/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Convert get_rooms to use runInteraction so the transacion has a more helpful ↵ | Erik Johnston | 2015-02-11 | 1 | -30/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description | ||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson | Erik Johnston | 2015-02-11 | 3 | -22/+75 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'bugs/SYN-264' into develop | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -18/+50 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Added another TODO note | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -0/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Cache the result of a get_rooms_for_user query, to make ↵ | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -7/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_rooms_intersect() much lighter in the read-common case | ||||
| | * | | | | | | | First step of making user_rooms_intersect() faster - implement in ↵ | Paul "LeoNerd" Evans | 2015-02-11 | 1 | -18/+20 |
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | intersection logic in Python code terms of a DB query that is cacheable per user | ||||
| * | | | | | | | Invalidate the cache for an event if it is redacted | Mark Haines | 2015-02-11 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix formatting | Mark Haines | 2015-02-11 | 1 | -2/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add a cache for get_event | Mark Haines | 2015-02-11 | 2 | -3/+24 |
| |/ / / / / / | |||||
* | | | | | | | pyflakes | Erik Johnston | 2015-02-11 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵ | Erik Johnston | 2015-02-11 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSONEncoder that understands FrozenDict | ||||
* | | | | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 4 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Code-style fixes | Mark Haines | 2015-02-10 | 2 | -4/+6 |
| | | | | | | |||||
* | | | | | | Fix pyflakes | Mark Haines | 2015-02-10 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Add performance counters for different stages of loading events | Mark Haines | 2015-02-10 | 1 | -24/+60 |
| | | | | | | |||||
* | | | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids in | Mark Haines | 2015-02-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | txn names | ||||
* | | | | | | Formatting | Mark Haines | 2015-02-09 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Performance counters for database transaction names | Mark Haines | 2015-02-09 | 1 | -1/+31 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fix typo | Erik Johnston | 2015-02-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Log database time every 10s and log as percentage | Erik Johnston | 2015-02-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Time how long we're spending on the database thread | Erik Johnston | 2015-02-09 | 1 | -0/+25 |
| | | | | | |||||
* | | | | | Move delta/v13.sql to delta/v12.sql | Erik Johnston | 2015-02-06 | 2 | -24/+11 |
| |_|_|/ |/| | | | |||||
* | | | | Give server default rules the 'default' attribute and fix various brokenness. | David Baker | 2015-02-05 | 1 | -2/+5 |
| |_|/ |/| | | |||||
* | | | Merge pull request #47 from matrix-org/signature_failures | Erik Johnston | 2015-02-05 | 1 | -75/+136 |
|\ \ \ | | | | | | | | | Federation fixes. | ||||
| * | | | Brief comment on why we do some things on every call to persist_event and ↵ | Erik Johnston | 2015-02-04 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | not others | ||||
| * | | | Rearrange persist_event so that do all the queries that need to be done ↵ | Erik Johnston | 2015-02-04 | 1 | -71/+74 |
| | | | | | | | | | | | | | | | | before returning early if we have already persisted that event. | ||||
| * | | | Add doc to get_event | Erik Johnston | 2015-02-03 | 1 | -0/+15 |
| | | | | |||||
| * | | | Try to ensure we don't persist an event we have already persisted. In ↵ | Erik Johnston | 2015-02-03 | 1 | -4/+36 |
| | | | | | | | | | | | | | | | | persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering. | ||||
| * | | | Don't fail an entire request if one of the returned events fails a signature ↵ | Erik Johnston | 2015-02-02 | 1 | -8/+13 |
| | |/ | |/| | | | | | | | check. If an event does fail a signature check, look in the local database and request it from the originator. | ||||
* / | | s/instance_handle/profile_tag/ | David Baker | 2015-02-03 | 3 | -9/+9 |
|/ / | |||||
* | | Merge pull request #43 from matrix-org/rejections | Erik Johnston | 2015-01-30 | 1 | -1/+11 |
|\ \ | | | | | | | Rejections | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 8 | -11/+141 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/im.sql | ||||
| * \ \ | Merge branch 'replication_split' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 1 | -5/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections Conflicts: synapse/storage/schema/delta/v12.sql | ||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 8 | -6/+562 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * | | | | | Initial implementation of auth conflict resolution | Erik Johnston | 2015-01-29 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 2 | -0/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 1 | -11/+49 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Client v2 sync | ||||
| * | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-30 | 1 | -4/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix token formatting | Mark Haines | 2015-01-30 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Filter the recent events before applying the limit when doing an incremental ↵ | Mark Haines | 2015-01-30 | 1 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with a gap | ||||
| * | | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 2 | -5/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 6 | -12/+132 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| * | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of ↵ | Mark Haines | 2015-01-29 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes is small | ||||
| * | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 7 | -4/+563 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Start implementing incremental initial sync | Mark Haines | 2015-01-27 | 1 | -9/+32 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #42 from matrix-org/replication_split | Mark Haines | 2015-01-30 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Replication split | ||||
| * | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 8 | -6/+556 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | replication_split | ||||
| * | | | | | | | | Split up replication_layer module into client, server and transaction queue | Erik Johnston | 2015-01-26 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-23 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Add storage method have_events | Erik Johnston | 2015-01-23 | 1 | -0/+29 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove merge conflict | Erik Johnston | 2015-01-30 | 1 | -3/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Remember to add schema file to list | Erik Johnston | 2015-01-30 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 4 | -1/+121 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
| * \ \ \ \ \ \ \ \ | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 4 | -1/+114 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | Client v2 filter | ||||
| | * | | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_user | Mark Haines | 2015-01-30 | 1 | -4/+0 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 2 | -5/+6 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 8 | -6/+568 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Move bump schema delta | Mark Haines | 2015-01-29 | 1 | -0/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Also edit the filter column on the delta SQL | Kegan Dougal | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | s/definition/filter_json/ since definition is now used to mean a component ↵ | Kegan Dougal | 2015-01-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the filter, rather than the complete json | ||||
| | * | | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Created schema delta | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -1/+25 |
| | | | | | | | | | |||||
| | * | | | | | | | Initial stab at real SQL storage implementation of user filter definitions | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -14/+60 |
| | | | | | | | | | |||||
| | * | | | | | | | Move storage of user filters into real datastore layer; now have to mock it ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -1/+48 |
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | out in the REST-level tests | ||||
| * | | | | | | | Add room member count condition and default rule to make a noise on rooms of ↵ | David Baker | 2015-01-30 | 1 | -1/+4 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | only 2 people. | ||||
* | | | | | | | Be more specific in naming columns in selects. | Erik Johnston | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Put CREATE rejections into seperate .sql | Erik Johnston | 2015-01-30 | 2 | -7/+21 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 9 | -8/+559 |
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * | | | | Code style fixes. | Mark Haines | 2015-01-29 | 2 | -5/+6 |
| | |/ / | |/| | | |||||
| * | | | SYN-252: Supply the stream and topological parts in the correct order to the ↵ | Mark Haines | 2015-01-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | constructor | ||||
| * | | | Allow the push rule delete method to take more specifiers. | David Baker | 2015-01-28 | 1 | -8/+11 |
| | |/ | |/| | |||||
| * | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 1 | -1/+2 |
| |\ \ | | | | | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| | * | | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 1 | -1/+2 |
| | |/ | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| * | | Move pushers delta to v12 and bump schema version | David Baker | 2015-01-28 | 2 | -1/+1 |
| | | | |||||
| * | | Use %s instead of + | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | |||||
| * | | Newline | David Baker | 2015-01-28 | 1 | -0/+1 |
| | | | |||||
| * | | Redundant parens | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | |||||
| * | | unnecessary newlines | David Baker | 2015-01-28 | 1 | -2/+0 |
| | | | |||||
| * | | More magic commas (including the place I copied it from...) | David Baker | 2015-01-28 | 1 | -4/+4 |
| | | | |||||
| * | | Google doc style | David Baker | 2015-01-28 | 1 | -4/+5 |
| | | | |||||
| * | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 1 | -2/+3 |
| |\| | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| | * | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+3 |
| | | | |||||
| * | | Add brackets to make get room name / alias work | David Baker | 2015-01-26 | 1 | -2/+2 |
| | | | |||||
| * | | Add API to delete push rules. | David Baker | 2015-01-23 | 1 | -0/+9 |
| | | | |||||
| * | | Fix adding rules without before/after & add the rule that we couldn't find ↵ | David Baker | 2015-01-23 | 1 | -3/+5 |
| | | | | | | | | | | | | to the error | ||||
| * | | As yet fairly untested GET API for push rules | David Baker | 2015-01-22 | 1 | -4/+4 |
| | | | |||||
| * | | oops, this is not its own schema file | David Baker | 2015-01-22 | 1 | -1/+0 |
| | | | |||||
| * | | Insufficient newlines | David Baker | 2015-01-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 3 | -114/+100 |
| |\| | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 3 | -0/+29 |
| | | |