Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-16 | 45 | -373/+1193 |
|\ | | | | | | | | | Conflicts: synapse/storage/appservice.py | ||||
| * | add ToC and fix typoe | Matthew Hodgson | 2015-03-14 | 1 | -1/+4 |
| | | |||||
| * | actually uphold the bind_host parameter. in theory should make ipv6 binds ↵ | Matthew Hodgson | 2015-03-14 | 2 | -3/+13 |
| | | | | | | | | work like bind_host: 'fe80::1%lo0' | ||||
| * | uncommited WIP from MWC | Matthew Hodgson | 2015-03-14 | 2 | -12/+15 |
| | | |||||
| * | Merge pull request #108 from matrix-org/metrics | Paul Evans | 2015-03-13 | 20 | -44/+790 |
| |\ | | | | | | | Metrics | ||||
| | * | Merge remote-tracking branch 'origin/develop' into metrics | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+8 |
| | |\ | |||||
| | * | | Appease pyflakes | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Delete unused import of NOT_READY_YET | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-12 | 9 | -27/+46 |
| | | | | |||||
| | * | | Option to serve metrics from their own localhost-only TCP port instead of ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -2/+15 |
| | | | | | | | | | | | | | | | | muxed on the main listener | ||||
| | * | | Fold the slightly-odd bind_port/secure_port/etc.. logic into ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -12/+11 |
| | | | | | | | | | | | | | | | | SynapseHomeServer.start_listening() | ||||
| | * | | Build MetricsResource as a specific HomeServer dependency | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -6/+11 |
| | | | | |||||
| | * | | 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 | ||||
| | * | | Neater metrics from TransactionQueue | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -9/+11 |
| | | | | |||||
| | * | | Add a counter to track total number of events served by the notifier | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+3 |
| | | | | |||||
| | * | | Replace the @metrics.counted annotations in federation with ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -41/+29 |
| | | | | | | | | | | | | | | | | specifically-written counters and distributions | ||||
| | * | | Add an .inc_by() method to CounterMetric; implement DistributionMetric a ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -26/+16 |
| | | | | | | | | | | | | | | | | neater way | ||||
| | * | | 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 | ||||
| | * | | Don't forbid '_' in metric basenames any more, to allow things like foo_time | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+0 |
| | | | | |||||
| | * | | Rename TimerMetric to DistributionMetric; as it could count more than just time | Paul "LeoNerd" Evans | 2015-03-12 | 4 | -33/+37 |
| | | | | |||||
| | * | | 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 | ||||
| | * | | Export CacheMetric as hits+total, rather than hits+misses, as it's easier to ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | derive hit ratio from that | ||||
| | * | | Count incoming HTTP requests per servlet that responds | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -7/+15 |
| | | | | |||||
| | * | | Remember to emit final linefeed from /metrics page, or Prometheus gets upset | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+2 |
| | | | | |||||
| | * | | Prometheus needs "escaped" label values | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -29/+33 |
| | | | | |||||
| | * | | Kill unused CounterMetric.fetch() method | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+0 |
| | | | | |||||
| | * | | Use _ instead of . as a metric namespacing separator, for Prometheus | Paul "LeoNerd" Evans | 2015-03-12 | 8 | -18/+34 |
| | | | | |||||
| | * | | Have all @metrics.counted use a single metric name vectored on the method ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | name, rather than a brand new scalar counter per counted method | ||||
| | * | | Bugfix to rendering output of vectored TimerMetrics | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -7/+6 |
| | | | | |||||
| | * | | Rename Metrics' "keys" to "labels" | Paul "LeoNerd" Evans | 2015-03-12 | 7 | -26/+26 |
| | | | | |||||
| | * | | Provide some process resource usage metrics | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+27 |
| | | | | |||||
| | * | | 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 | ||||
| | * | | Put some gauge metrics on the number of notifier listeners, and notified-on ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+39 |
| | | | | | | | | | | | | | | | | objects (users, rooms, appservices) | ||||
| | * | | Collect per-SQL-verb timer stats on query execution time | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+11 |
| | | | | |||||
| | * | | Neater register_* methods on overall Metrics container | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -22/+12 |
| | | | | |||||
| | * | | Neater implementation of metric render methods by pulling out 'render' as a ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -18/+15 |
| | | | | | | | | | | | | | | | | base method that calls self.render_item | ||||
| | * | | Initial hack at a TimerMetric; for storing counts + duration accumulators | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -1/+83 |
| | | | | |||||
| | * | | Delete a couple of TODO markers of monitoring stats now done | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -2/+0 |
| | | | | |||||
| | * | | Put vector gauges on transaction queue pending PDU and EDU dicts | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+14 |
| | | | | |||||
| | * | | Ensure that /_synapse/metrics response is UTF-8 encoded | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+2 |
| | | | | |||||
| | * | | Implement vector CallbackMetrics | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -3/+23 |
| | | | | |||||
| | * | | Neater introspection methods on BaseMetric so that subclasses don't need to ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | touch self.keys directly | ||||
| | * | | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 4 | -19/+30 |
| | | | | | | | | | | | | | | | | component to give the size of the cache | ||||
| | * | | Ensure that exceptions while rendering individual metrics don't stop others ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | from being rendered anyway - especially useful for CallbackMetric | ||||
| | * | | Add a scalar gauge metric on the size of the presence user cachemap | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+7 |
| | | | | |||||
| | * | | Initial attempt at a scalar callback-based metric to give instantaneous ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -2/+45 |
| | | | | | | | | | | | | | | | | snapshot gauges | ||||
| | * | | Sprinkle some CacheCounterMetrics around the synapse.storage layer | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+15 |
| | | | | |||||
| | * | | Create the concept of a cachecounter metric; generating two counters ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -8/+73 |
| | | | | | | | | | | | | | | | | specific to caches | ||||
| | * | | Add vector counters to HTTP clients and servers; count the requests by ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -4/+61 |
| | | | | | | | | | | | | | | | | method and responses by method and response code | ||||
| | * | | Pull out all uses of the underlying HTTP user agent .request() method into a ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | single wrapper function, to make adding metrics easier | ||||
| | * | | Initial attempt at sprinkling some @metrics.counted decorations around the ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -0/+28 |
| | | | | | | | | | | | | | | | | federation code | ||||
| | * | | Have the MetricsResource actually render metric counters | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+3 |
| | | | | |||||
| | * | | An initial implementation of a 'metrics' instance, similar to a 'logger' for ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+69 |
| | | | | | | | | | | | | | | | | keeping counter stats on method calls | ||||
| | * | | Delete pointless (and unreachable) __init__ method from FederationClient | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+0 |
| | | | | |||||
| | * | | Initial tiny attempt at (vectorable) counter metrics | Paul "LeoNerd" Evans | 2015-03-12 | 3 | -0/+115 |
| | | | | |||||
| | * | | A trivial 'hello world'-style resource on /_synapse/metrics, with optional ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | | commandline flag | ||||
| | * | | Commandline option to enable metrics system | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -1/+34 |
| | | | | |||||
| | * | | No need to explicitly pass 'web_client' in to create_resource_tree as it can ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | be found via config | ||||
| | * | | Expose 'config' as a real HomeServer dependency key | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | Also bump dependency link version | Erik Johnston | 2015-03-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | bump dep on syweb 0.6.5 | Matthew Hodgson | 2015-03-12 | 2 | -3/+4 |
| | |/ | |/| | |||||
| * | | More sacrifices to the pep8 gods. | David Baker | 2015-03-12 | 1 | -2/+8 |
| |/ | |||||
| * | Log the matching push rule. | David Baker | 2015-03-11 | 1 | -2/+4 |
| | | |||||
| * | Merge pull request #107 from matrix-org/add_desc_to_storage_execute | Paul Evans | 2015-03-11 | 9 | -17/+18 |
| |\ | | | | | | | Add desc to storage execute | ||||
| | * | 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 |
| |/ | |||||
| * | Again, underscore, not hyphen | David Baker | 2015-03-11 | 1 | -1/+1 |
| | | |||||
| * | 'false' is not False | David Baker | 2015-03-11 | 1 | -5/+5 |
| | | |||||
| * | PEP8 blank lines | David Baker | 2015-03-11 | 1 | -0/+1 |
| | | |||||
| * | Add the master push rule for the break-my-push button. Allow server default ↵ | David Baker | 2015-03-10 | 4 | -33/+63 |
| | | | | | | | | 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 bug in logging. | Erik Johnston | 2015-03-10 | 1 | -5/+5 |
| | | |||||
| * | in_thread takes no arguments | Erik Johnston | 2015-03-10 | 1 | -1/+1 |
| | | |||||
| * | Fix bug in logging. | Erik Johnston | 2015-03-10 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #105 from matrix-org/erikj-perf | Erik Johnston | 2015-03-10 | 1 | -15/+46 |
| |\ | | | | | | | Add a Twisted Service to synapse.app.homeserver | ||||
| | * | Split out the 'run' from 'setup' | Erik Johnston | 2015-03-10 | 1 | -26/+27 |
| | | | |||||
| | * | Add documentation. When starting via twistd respect soft_file_limit config ↵ | Erik Johnston | 2015-03-10 | 1 | -2/+17 |
| | | | | | | | | | | | | option. | ||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-03-09 | 207 | -3564/+13910 |
| | |\ | |||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-01-22 | 70 | -1666/+826 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| | * | | | Add twisted Service interface | Erik Johnston | 2015-01-07 | 2 | -3/+19 |
| | | | | | |||||
| * | | | | Merge pull request #101 from matrix-org/neaten-federation-servlets | Erik Johnston | 2015-03-09 | 1 | -182/+157 |
| |\ \ \ \ | | | | | | | | | | | | | Neaten federation servlets | ||||
| | * | | | | Appease pep8 | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -19/+27 |
| | | | | | | |||||
| | * | | | | Append a $ on PATH at registration time, meaning each PATH attribute doesn't ↵ | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | need it | ||||
| | * | | | | Slightly neater(?) arrangement of authentication wrapper for HTTP servlet ↵ | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -25/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | methods | ||||
| | * | | | | Remove the dead 'rate_limit_origin' method from TransportLayerServer | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -6/+0 |
| | | | | | | |||||
| | * | | | | Move federation API responding code out of weird mix of lambdas into ↵ | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -170/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | Servlet-style methods on instances | ||||
| * | | | | | Merge pull request #104 from matrix-org/get_joined_rooms_for_user | Erik Johnston | 2015-03-09 | 8 | -21/+22 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Get joined rooms for user | ||||
| | * | | | | Fix tests | Erik Johnston | 2015-03-09 | 3 | -10/+10 |
| | | | | | | |||||
| | * | | | | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This ↵ | Erik Johnston | 2015-03-09 | 5 | -11/+12 |
| |/ / / / | | | | | | | | | | | | | | | | uses the a storage api that is cached. | ||||
| * | | | | D'oh: underscore, not hyphen | David Baker | 2015-03-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Call notifications should be override else they'll get clobbered by ↵ | David Baker | 2015-03-06 | 1 | -21/+21 |
| | | | | | | | | | | | | | | | | | | | | sender/room rules. | ||||
| * | | | | Merge branch 'develop' into release-v0.8.0 | Erik Johnston | 2015-03-06 | 1 | -7/+13 |
| |\ \ \ \ | |||||
| * | | | | | Dial down logging for failed pushers | David Baker | 2015-03-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update CHANGES to reflect no more fallback rule | David Baker | 2015-03-06 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Specify when we don't want to highlight | David Baker | 2015-03-06 | 1 | -2/+17 |
| | | | | | | |||||
| * | | | | | Remove the fallback rule - we probably don't want to be notifying for ↵ | David Baker | 2015-03-06 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | everything even if we don't know what it is. | ||||
* | | | | | | Fix remaining scheduler bugs. Add more informative logging. | Kegan Dougal | 2015-03-10 | 3 | -37/+28 |
| | | | | | | |||||
* | | | | | | Remove unused import | Kegan Dougal | 2015-03-09 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Bug fixes whilst putting it all together | Kegan Dougal | 2015-03-09 | 3 | -6/+8 |
| | | | | | | |||||
* | | | | | | Use event IDs instead of dumping event content in the txns table. | Kegan Dougal | 2015-03-09 | 3 | -20/+26 |
| | | | | | | |||||
* | | | | | | Use seconds; start gluing in the AS scheduler into the AS handler. | Kegan Dougal | 2015-03-09 | 6 | -15/+38 |
| | | | | | | |||||
* | | | | | | Finish appservice txn storage impl and tests. | Kegan Dougal | 2015-03-09 | 3 | -16/+139 |
| | | | | | | |||||
* | | | | | | Implement create_appservice_txn with tests. | Kegan Dougal | 2015-03-09 | 2 | -4/+109 |
| | | | | | | |||||
* | | | | | | Partially implement txn store methods with tests. | Kegan Dougal | 2015-03-09 | 2 | -19/+213 |
| | | | | | | |||||
* | | | | | | Start implementing ApplicationServiceTransactionStore | Kegan Dougal | 2015-03-06 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-06 | 20 | -130/+505 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | When setting display name more graciously handle failures to update room state. | Erik Johnston | 2015-03-06 | 1 | -7/+13 |
| |/ / / / | |||||
| * | | | | Update CHANGES | Erik Johnston | 2015-03-06 | 1 | -2/+31 |
| | | | | | |||||
| * | | | | Update UPGRADES.rst | Erik Johnston | 2015-03-06 | 1 | -5/+2 |
| | | | | | |||||
| * | | | | Add attribute so push gateways can tell if a member event is about the user ↵ | David Baker | 2015-03-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | in question | ||||
| * | | | | Bump version | Erik Johnston | 2015-03-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-03-06 | 3 | -54/+59 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #98 from matrix-org/hotfixes-v0.7.1-r4 v0.7.1-r4 | Erik Johnston | 2015-03-03 | 2 | -3/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Hotfixes v0.7.1 r4 | ||||
| | | * | | | | Bump version | Erik Johnston | 2015-03-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Also bump version of downloaded syweb | Erik Johnston | 2015-03-03 | 1 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #97 from matrix-org/hotfixes-v0.7.1-r3 v0.7.1-r3 | Erik Johnston | 2015-03-03 | 2 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Bump syweb dependency | ||||
| | | * | | | | Bump syweb dependency | Erik Johnston | 2015-03-03 | 2 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #87 from brabo/master | Mark Haines | 2015-02-23 | 1 | -0/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | added "cd ~/.synapse" before setup of the homeserver to generate our fil... | ||||
| | | * | | | | added "cd ~/.synapse" before setup of the homeserver to generate our files ↵ | brabo | 2015-02-22 | 1 | -0/+2 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | in there instead of ~ | ||||
| | * | | | | Merge pull request #86 from matrix-org/v0.7.1-r2 v0.7.1-r2 | Erik Johnston | 2015-02-21 | 2 | -54/+57 |
| | |\ \ \ \ | | | | | | | | | | | | | | | V0.7.1 r2 | ||||
| | | * | | | | Bump version | Erik Johnston | 2015-02-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Don't exit if we can't work out if we're running in a git repo | Erik Johnston | 2015-02-21 | 1 | -53/+56 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #96 from matrix-org/pushrules2 | Erik Johnston | 2015-03-06 | 5 | -17/+226 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Evolution of push rules | ||||
| | * | | | | | Schema change as delta in v14 | David Baker | 2015-03-06 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | Add more server default rules so we have default rules for whether you get ↵ | David Baker | 2015-03-06 | 2 | -6/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifs for invites / random member events | ||||
| | * | | | | | Comment typo | David Baker | 2015-03-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Suppress notices should trump content/room/sender rules. | David Baker | 2015-03-06 | 1 | -13/+13 |
| | | | | | | | |||||
| | * | | | | | Add the highlight tweak where messages should be highlighted a different ↵ | David Baker | 2015-03-06 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | colour in appropriate clients. | ||||
| | * | | | | | Add default rule to suppress notices. | David Baker | 2015-03-04 | 1 | -0/+13 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' into pushrules2 | David Baker | 2015-03-04 | 32 | -661/+818 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/pusher.sql | ||||
| | * \ \ \ \ \ | Merge branch 'develop' into pushrules2 | David Baker | 2015-03-04 | 33 | -202/+1044 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 | 3 | -8/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Oops, missed a replacement. | David Baker | 2015-03-02 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Blank lines | David Baker | 2015-03-02 | 2 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Rename the room-with-two-people rule to be more compatible if we have actual ↵ | David Baker | 2015-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one to one rooms. | ||||
| | * | | | | | | | It's set_tweak now, not set_sound | David Baker | 2015-02-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | SYN-267 Add a fallback rule as an explicit server default rule and make the ↵ | David Baker | 2015-02-26 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default dont-notify so you effectively have a "notify for everything else" switch you can turn on and off. | ||||
| | * | | | | | | | Add API for getting/setting enabled-ness of push rules. | David Baker | 2015-02-26 | 3 | -9/+77 |
| | | | | | | | | | |||||
| | * | | | | | | | 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 | 5 | -0/+46 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #103 from matrix-org/no_tls_private_key | Erik Johnston | 2015-03-06 | 3 | -7/+16 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't look for a TLS private key if we have set --no-tls | ||||
| | * | | | | | | | | Unused import | Erik Johnston | 2015-03-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Don't look for an TLS private key if we have set --no-tls | Erik Johnston | 2015-03-06 | 3 | -8/+17 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #102 from matrix-org/randomize_stream_timeout | Erik Johnston | 2015-03-06 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add some randomness to the user specified timeout on event streams to mi... | ||||
| | * | | | | | | | | Add some randomness to the user specified timeout on event streams to ↵ | Erik Johnston | 2015-03-06 | 1 | -0/+9 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | mitigate against thundering herds problems | ||||
| * | | | | | | | | Log error message when we fail to fetch remote server keys | Erik Johnston | 2015-03-05 | 1 | -2/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #100 from matrix-org/missing_pdu_compat | Erik Johnston | 2015-03-05 | 2 | -15/+114 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | Handle if get_missing_pdu returns 400 or not all events. | ||||
| | * | | | | | | | Docs | Erik Johnston | 2015-03-05 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove unecessary check | Erik Johnston | 2015-03-05 | 1 | -6/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Respect min_depth argument | Erik Johnston | 2015-03-05 | 1 | -4/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Docs. | Erik Johnston | 2015-03-05 | 1 | -0/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Handle if get_missing_pdu returns 400 or not all events. | Erik Johnston | 2015-03-05 | 2 | -15/+100 |
| | | | | | | | | | |||||
| * | | | | | | | | Slightly reduce the insane amounts of indentation in main http server ↵ | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -21/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response path, by 'continue'ing around a non-match or falling through | ||||
* | | | | | | | | | Assign the AS ID from the database; replace old placeholder txn id. | Kegan Dougal | 2015-03-06 | 2 | -4/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Add appservice txns sql schema | Kegan Dougal | 2015-03-06 | 3 | -1/+38 |
| | | | | | | | | | |||||
* | | | | | | | | | Upper bound the backoff. | Kegan Dougal | 2015-03-06 | 1 | -1/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Update UTs | Kegan Dougal | 2015-03-06 | 1 | -5/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Apply clarity and docstrings | Kegan Dougal | 2015-03-06 | 3 | -3/+15 |
| | | | | | | | | | |||||
* | | | | | | | | | Finish synapse.appservice.scheduler implementation. | Kegan Dougal | 2015-03-06 | 4 | -53/+186 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With tests to assert behaviour. Not hooked up yet. Stub datastore methods not implemented yet. | ||||
* | | | | | | | | | Add some loggers | Kegan Dougal | 2015-03-06 | 1 | -0/+10 |
| | | | | | | | | | |||||
* | | | | | | | | | Flesh out more stub functions. | Kegan Dougal | 2015-03-06 | 4 | -12/+52 |
| | | | | | | | | | |||||
* | | | | | | | | | Add stub ApplicationServiceTransactionStore. Bootstrap Recoverers. Fill in ↵ | Kegan Dougal | 2015-03-06 | 2 | -7/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stub Transaction functions. | ||||
* | | | | | | | | | Add more tests; fix bugs. | Kegan Dougal | 2015-03-06 | 2 | -9/+49 |
| | | | | | | | | | |||||
* | | | | | | | | | Start adding some tests | Kegan Dougal | 2015-03-06 | 2 | -10/+119 |
| | | | | | | | | | |||||
* | | | | | | | | | Rejig structure given the appservice_handler already filters the correct ↵ | Kegan Dougal | 2015-03-06 | 1 | -59/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASes to use. | ||||
* | | | | | | | | | Minor tweaks | Kegan Dougal | 2015-03-05 | 1 | -7/+9 |
| | | | | | | | | | |||||
* | | | | | | | | | Add stub architecture for txn reliability. | Kegan Dougal | 2015-03-05 | 1 | -10/+111 |
| | | | | | | | | | |||||
* | | | | | | | | | Add stub scheduler module for txn reliability | Kegan Dougal | 2015-03-05 | 1 | -0/+68 |
| | | | | | | | | | |||||
* | | | | | | | | | Add txn_id kwarg to push methods | Kegan Dougal | 2015-03-05 | 1 | -4/+9 |
|/ / / / / / / / | |||||
* / / / / / / / | Rename rooms_to_listeners to room_to_listeners, for consistency with user_ ↵ | Paul "LeoNerd" Evans | 2015-03-05 | 1 | -8/+8 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | and appservice_* | ||||
* | | / / / / | Give LruCache a __len__, so that len(cache) works | Paul "LeoNerd" Evans | 2015-03-04 | 1 | -0/+7 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #99 from matrix-org/schema_versioning | Erik Johnston | 2015-03-04 | 31 | -651/+329 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Schema versioning | ||||
| * | | | | | | 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 | 30 | -622/+165 |
| | | | | | | | |||||
| * | | | | | | SYN-67: Begin changing the way we handle schema versioning | Erik Johnston | 2015-03-02 | 1 | -38/+106 |
| | | | | | | | |||||
* | | | | | | | WIP vertobridge AS | Matthew Hodgson | 2015-03-04 | 1 | -0/+489 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Fix upgrade instructions | David Baker | 2015-03-02 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | 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 |
| | | | | | |||||
* | | | | | Fix bug which prevented the HS pushing events to the AS due to FrozenEvents | Kegan Dougal | 2015-03-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Bump webclient version | Erik Johnston | 2015-03-02 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #93 from matrix-org/application-services-exclusive | Kegsay | 2015-03-02 | 10 | -69/+215 |
|\ \ \ \ \ | | | | | | | | | | | | | Application services exclusive flag support | ||||
| * | | | | | Wording tweaks | Kegan Dougal | 2015-03-02 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Run deltas and bump user_version in upgrade script | Kegan Dougal | 2015-03-02 | 3 | -6/+29 |
| | | | | | | |||||
| * | | | | | Add upgrade script | Kegan Dougal | 2015-03-02 | 1 | -0/+36 |
| | | | | | | |||||
| * | | | | | Implement exclusive namespace checks. | Kegan Dougal | 2015-02-27 | 2 | -7/+18 |
| | | | | | | |||||
| * | | | | | Add more unit tests for exclusive namespaces. | Kegan Dougal | 2015-02-27 | 2 | -2/+50 |
| | | | | | | |||||
| * | | | | | Update unit tests to use new format. | Kegan Dougal | 2015-02-27 | 2 | -19/+32 |
| | | | | | | |||||
| * | | | | | Add functions to return whether an AS has exclusively claimed a matching ↵ | Kegan Dougal | 2015-02-27 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | namespace. | ||||
| * | | | | | Convert expected format for AS regex to include exclusivity. | Kegan Dougal | 2015-02-27 | 3 | -39/+38 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | 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 pull request #88 from matrix-org/batched_get_pdu | Erik Johnston | 2015-03-02 | 8 | -57/+231 |
|\ \ \ \ \ | | | | | | | | | | | | | Batched get pdu | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-03-02 | 32 | -147/+1212 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #83 from matrix-org/nofile_limit_config | Erik Johnston | 2015-03-02 | 2 | -8/+33 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add config option to set the soft fd limit on start | ||||
| * | | | | | | By default set soft limit to hard limit | Erik Johnston | 2015-02-20 | 2 | -7/+11 |
| | | | | | | | |||||
| * | | | | | | Rename resource variable so as to not shadow module import | Erik Johnston | 2015-02-19 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Add config option to set the soft fd limit on start | Erik Johnston | 2015-02-19 | 2 | -3/+24 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #94 from matrix-org/federation_rate_limit | Erik Johnston | 2015-03-02 | 4 | -3/+275 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Federation rate limit | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-03-02 | 10 | -59/+284 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | federation_rate_limit | ||||
* | | | | | | | | Merge pull request #95 from matrix-org/serialize_transaction_processing | Erik Johnston | 2015-03-02 | 1 | -20/+12 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Process transactions serially. | ||||
| * | | | | | | | | If we're yielding don't add errback | Erik Johnston | 2015-03-02 | 1 | -7/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Process transactions serially. | Erik Johnston | 2015-03-02 | 1 | -14/+10 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the events received in a transaction are ordered, later events might depend on earlier events and so we shouldn't blindly process them in parellel. | ||||
* | | | | | | | | Merge pull request #92 from matrix-org/application-services-event-stream | Kegsay | 2015-03-02 | 9 | -39/+272 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Application services event stream support | ||||
| * | | | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | Fix unit tests | Kegan Dougal | 2015-02-27 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Notify appservices of invites mid-poll. | Kegan Dougal | 2015-02-27 | 1 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires the notifier to have knowledge of appservice listeners so it can do the regex checks on incoming invites to see if the state_key matches. It isn't enough to just rely on the room listeners and store.get_app_service_rooms as the room will initially not exist or won't be on the ASes radar due to having none of its users in the room. | ||||
| * | | | | | | | Check for membership invite events correctly. | Kegan Dougal | 2015-02-26 | 1 | -2/+21 |
| | | | | | | | | |||||
| * | | | | | | | Update CHANGES | Kegan Dougal | 2015-02-26 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Finish impl to get new events for AS. ASes should now be able to poll /events | Kegan Dougal | 2015-02-26 | 2 | -8/+58 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 4 | -12/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | polling. | ||||
| | * | | | | | | Use contextlib.contextmanager instead of a custom class | Erik Johnston | 2015-03-02 | 1 | -22/+12 |
| | | | | | | | | |||||
| | * | | | | | | Make the federation server ratelimiting configurable. | Erik Johnston | 2015-03-02 | 2 | -5/+41 |
| | | | | | | | | |||||
| | * | | | | | | Move federation rate limiting out of transport layer | Erik Johnston | 2015-02-27 | 3 | -204/+230 |
| | | | | | | | | |||||
| | * | | | | | | Document FederationRateLimiter | Erik Johnston | 2015-02-27 | 1 | -8/+51 |
| | | | | | | | | |||||
| | * | | | | | | Initial implementation of federation server rate limiting | Erik Johnston | 2015-02-26 | 2 | -5/+182 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | SYWEB-278 Don't allow rules with no rule_id. | David Baker | 2015-02-25 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | turns uris config options should append since it's a list | David Baker | 2015-02-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fix YAML syntax of turn config example | David Baker | 2015-02-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | tabs/spaces | David Baker | 2015-02-24 | 1 | -8/+8 |
| | | | | | | |||||
* | | | | | | Use standard form submission so the go button on the keyboard works. | David Baker | 2015-02-24 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #91 from matrix-org/registration-fallback-ios-display | Kegsay | 2015-02-24 | 2 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fallback registration page: make the page autoresize on iPhone Safari/Webview | ||||
| * | | | | | | Fallback registration page: oops. Removed dev test. | manuroe | 2015-02-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fallback registration page: added the classic viewport meta to fix the ↵ | manuroe | 2015-02-24 | 2 | -1/+6 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | display on iPhone Safari and webview. The width of input elements also needs to be fixed. | ||||
* | | | | | | %s for strings otherwise you end up sending 'u"foo"' | David Baker | 2015-02-24 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #89 from matrix-org/registration-fallback | Erik Johnston | 2015-02-24 | 12 | -1/+433 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Registration fallback | ||||
| * | | | | | | Update CHANGES and UPGRADE | Kegan Dougal | 2015-02-24 | 2 | -0/+21 |
| | | | | | | | |||||
| * | | | | | | Set user-visible error when the server is misconfigured. | Kegan Dougal | 2015-02-24 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Trailing comma | Kegan Dougal | 2015-02-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add jquery | Kegan Dougal | 2015-02-23 | 1 | -0/+4 |
| | | | | | | |