summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #126 from matrix-org/csauthMark Haines2015-04-2834-287/+1323
|\
| * Add commentage.David Baker2015-04-271-0/+4
| * pep8David Baker2015-04-271-1/+2
| * logging argsDavid Baker2015-04-271-2/+2
| * Change to https for ID server communicationDavid Baker2015-04-241-3/+2
| * More underscoresDavid Baker2015-04-242-4/+4
| * Use underscores instead of camelcase for id server stuffDavid Baker2015-04-243-14/+14
| * pep8David Baker2015-04-241-2/+2
| * Merge branch 'develop' into csauthDavid Baker2015-04-2418-368/+585
| |\
| * | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-232-1/+4
| * | Remove ultimately unused feature of saving params from the first call in the ...David Baker2015-04-231-2/+10
| * | Add an error code to 'missing token' response.David Baker2015-04-232-1/+3
| * | Remove now-redundant email configDavid Baker2015-04-232-44/+1
| * | pep8David Baker2015-04-171-1/+1
| * | Password reset, finally.David Baker2015-04-173-7/+38
| * | Add endpoint to get threepids from serverDavid Baker2015-04-172-0/+23
| * | pep8David Baker2015-04-174-9/+6
| * | make add3pid servlet workDavid Baker2015-04-174-12/+82
| * | just the once would probably be fineDavid Baker2015-04-171-1/+0
| * | Merge branch 'develop' into csauthDavid Baker2015-04-1745-537/+1817
| |\ \
| * | | Register the 3pid servletDavid Baker2015-04-171-1/+3
| * | | password -> account servlet and add start of an 'add 3pid' endpointDavid Baker2015-04-172-2/+17
| * | | Need to yield the username check, otherwise very very weird things happen.David Baker2015-04-171-1/+1
| * | | Oops, left debugging in.David Baker2015-04-161-6/+0
| * | | Return user ID in use error straight awayDavid Baker2015-04-164-66/+88
| * | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-154-7/+24
| * | | Regstration with email in v2David Baker2015-04-156-29/+123
| * | | Add app service auth back in to v2 registerDavid Baker2015-04-022-5/+8
| * | | Throw sensible errors on not-json when allowing empty bodyDavid Baker2015-04-021-1/+4
| * | | pep8David Baker2015-04-021-0/+1
| * | | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-023-15/+63
| * | | Explain how I justified to myself making JsonResource not always send JSON.David Baker2015-04-011-0/+7
| * | | Completely replace fallback auth for C/S V2:David Baker2015-04-016-26/+280
| * | | Make docs a bit more trueDavid Baker2015-03-311-1/+1
| * | | Grammar and deduplicationDavid Baker2015-03-311-5/+4
| * | | pep8David Baker2015-03-313-4/+5
| * | | Update CAPTCHA_SETUP (it continues to ignore fallback, but I guess I should f...David Baker2015-03-301-21/+6
| * | | Add original, unmodified CAPTCHA-SETUP from the webclient repo before modifyi...David Baker2015-03-301-0/+46
| * | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-308-16/+192
| * | | pep8David Baker2015-03-261-2/+4
| * | | Delete pushers when changing passwordDavid Baker2015-03-263-37/+31
| * | | pep8 blank linesDavid Baker2015-03-251-1/+0
| * | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ...David Baker2015-03-255-28/+96
| * | | Fix testsDavid Baker2015-03-245-14/+14
| * | | Don't test exact equality of the list: as long as it has the fields we expect...David Baker2015-03-241-6/+5
| * | | unused importDavid Baker2015-03-241-1/+1
| * | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-248-26/+48
| * | | Make deleting other access tokens when you change your password actually workDavid Baker2015-03-242-6/+15
| * | | pep8 / pyflakesDavid Baker2015-03-232-7/+3
| * | | Implement password changing (finally) along with a start on making client/ser...David Baker2015-03-237-49/+236
* | | | Merge pull request #133 from matrix-org/invite_power_levelMark Haines2015-04-282-1/+10
|\ \ \ \
| * \ \ \ Merge branch 'develop' into invite_power_levelPaul "LeoNerd" Evans2015-04-2717-73/+366
| |\ \ \ \
| * | | | | Also remember to check 'invite' level for changesPaul "LeoNerd" Evans2015-04-211-0/+1
| * | | | | Create an 'invite' powerlevel when making new roomsPaul "LeoNerd" Evans2015-04-211-1/+2
| * | | | | Initial implementation of an 'invite' power_levelPaul "LeoNerd" Evans2015-04-211-0/+7
* | | | | | Merge pull request #130 from matrix-org/server_rename_checkMark Haines2015-04-282-1/+28
|\ \ \ \ \ \
| * | | | | | pep8David Baker2015-04-271-1/+1
| * | | | | | pep8David Baker2015-04-271-1/+0
| * | | | | | Run database check before daemonizing, at the cost of database hygiene.David Baker2015-04-273-27/+18
| * | | | | | rename db method to be more informativeDavid Baker2015-04-272-5/+5
| * | | | | | pep8David Baker2015-04-241-2/+2
| * | | | | | Check users in our table aren't on a different domain to the one we're config...David Baker2015-04-242-0/+37
* | | | | | | Output vim style mode markers into the yaml config fileMark Haines2015-04-281-3/+4
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #132 from matrix-org/observer_and_locksErik Johnston2015-04-273-1/+42
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix newlinesErik Johnston2015-04-271-2/+1
| * | | | | Pull inner function out.Erik Johnston2015-04-271-76/+77
| * | | | | Implement locks using create_observer for fetching media and server keysErik Johnston2015-04-272-60/+82
| * | | | | Implement create_observer.Erik Johnston2015-04-271-0/+19
|/ / / / /
* | | | | Add note about updating your signing keys (ie. "the auto thing")David Baker2015-04-241-0/+9
* | | | | Matrix ID server is now HTTPSDavid Baker2015-04-241-1/+1
* | | | | Remove ancient historyDavid Baker2015-04-241-4/+0
* | | | | Pedant: OS X has a spaceDavid Baker2015-04-241-1/+1
* | | | | Make one-to-one rule an underride otherwise bings don't work in one-to-one wr...David Baker2015-04-241-21/+21
* | | | | Fix spellingMark Haines2015-04-241-1/+1
* | | | | Call the super classes when generating configMark Haines2015-04-241-0/+1
* | | | | Copyright noticesMark Haines2015-04-246-0/+84
| |_|_|/ |/| | |
* | | | No commas here, otherwise our error string constants become tuples.David Baker2015-04-241-2/+2
* | | | Remove users from the remote_offline_serials list (and clean up empty element...Paul "LeoNerd" Evans2015-04-232-1/+38
* | | | Don't let the remote offline serial list grow arbitrarily largePaul "LeoNerd" Evans2015-04-231-0/+5
* | | | Store a list of the presence serial number at which remote users went offline...Paul "LeoNerd" Evans2015-04-232-0/+59
* | | | Generate presence event-stream JSON structures directlyPaul "LeoNerd" Evans2015-04-231-8/+9
* | | | Mumble ReST mumble ``fixed-width`` mumblePaul "LeoNerd" Evans2015-04-231-5/+5
* | | | Formatting / wording fixes to metrics docPaul "LeoNerd" Evans2015-04-231-12/+13
* | | | prometheus/metrics howto from LeoMatthew Hodgson2015-04-231-0/+49
* | | | Neater fetching of user's auth level in a room - squash to int() at access ti...Paul "LeoNerd" Evans2015-04-221-35/+12
* | | | Appease pep8Paul "LeoNerd" Evans2015-04-221-1/+0
* | | | Add info on breaking AS API changesKegsay2015-04-221-0/+34
|/ / /
* | | Much neater fetching of defined powerlevels from m.room.power_levels state eventPaul "LeoNerd" Evans2015-04-211-31/+21
* | | Remove debugging print statement accidentally committedPaul "LeoNerd" Evans2015-04-211-1/+0
* | | Sanitise a user's powerlevel to an int() before numerical comparison, because...Paul "LeoNerd" Evans2015-04-211-0/+7
* | | Bump syutil version to 0.0.5Mark Haines2015-04-211-3/+3
* | | Merge pull request #128 from matrix-org/unify_http_wrappersMark Haines2015-04-217-289/+251
|\ \ \
| * | | Set a version_string in BaseMediaResource so that the request_handler wrapper...Mark Haines2015-04-211-0/+1
| * | | Combine the request wrappers in rest/media/v1 and http/server into a single w...Mark Haines2015-04-217-198/+140
| * | | Split out the JsonResource request logging and error handling into a separate...Mark Haines2015-04-211-94/+113
* | | | Merge pull request #127 from matrix-org/bugs/SYN-350Mark Haines2015-04-211-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | SYN-350: Don't ratelimit the individual events generated during room creationMark Haines2015-04-211-4/+4
|/ / /
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-172-2/+7
|\ \ \
| * \ \ Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 v0.8.1-r4Erik Johnston2015-04-172-2/+7
| |\ \ \
| | * | | The new parameter to urlopen is "context" not "ctx"Mark Haines2015-04-171-1/+1
| | * | | Bump versionErik Johnston2015-04-171-1/+1
| | * | | As of version 2.7.9, urllib2 now checks SSL certsErik Johnston2015-04-171-1/+6
| |/ / /
* | | / Add kick users scriptKegan Dougal2015-04-171-0/+93
| |_|/ |/| |
* | | Filter typing nofication events to only those rooms the requesting user is a ...Paul "LeoNerd" Evans2015-04-151-2/+14
* | | Various minor fixes to unit-test structure around typing notificationsPaul "LeoNerd" Evans2015-04-152-2/+11
* | | Have TypingNotificationEventSource.get_new_events_for_user() return a deferre...Paul "LeoNerd" Evans2015-04-153-8/+15
* | | Neater implementation of membership change auth checks, ensuring we can't for...Paul "LeoNerd" Evans2015-04-151-18/+10
* | | Ensure that non-room-members cannot ban others, even if they do have enough p...Paul "LeoNerd" Evans2015-04-151-0/+5
* | | Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4Mark Haines2015-04-142-4/+4
|\ \ \
| * | | Update syutil version to 0.0.4Mark Haines2015-04-142-4/+4
|/ / /
* | | Merge pull request #121 from matrix-org/key-api-restructureMark Haines2015-04-144-1/+29
|\ \ \
| * | | Move server key api into rest/key/v1Mark Haines2015-04-144-1/+29
|/ / /
* | | Merge pull request #120 from matrix-org/bugs/SYN-339Mark Haines2015-04-091-4/+28
|\ \ \
| * | | Add commentMark Haines2015-04-091-0/+1
| * | | Unset the timer in the timeout callback so that we don't try to cancel it if ...Mark Haines2015-04-091-0/+1
| * | | SYN-339: Cancel the notifier timeout when the notifier firesMark Haines2015-04-091-4/+26
|/ / /
* | | Merge pull request #114 from matrix-org/improve_get_event_cacheMark Haines2015-04-083-23/+34
|\ \ \
| * | | Appease pep8Paul "LeoNerd" Evans2015-03-261-1/+2
| * | | Implement the main getEvent cache using Cache() instead of a custom applicati...Paul "LeoNerd" Evans2015-03-251-12/+7
| * | | Use FrozenEvent's reject_reason to decide whether to return it; don't include...Paul "LeoNerd" Evans2015-03-251-10/+14
| * | | Store the rejected reason in (Frozen)Event structsPaul "LeoNerd" Evans2015-03-252-4/+12
| * | | Indirect invalidations of _get_event_cache via a helper method to keep all us...Paul "LeoNerd" Evans2015-03-252-2/+5
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-082-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 v0.8.1-r3Erik Johnston2015-04-082-2/+2
| |\ \ \
| | * | | Bump versionErik Johnston2015-04-081-1/+1
| | * | | SYN-338: Fix typo that caused the cache to throw an exception in some instancesErik Johnston2015-04-081-1/+1
| |/ / /
* | | | Merge pull request #118 from matrix-org/dont-wait-for-notifyErik Johnston2015-04-081-4/+36
|\ \ \ \
| * | | | typoErik Johnston2015-04-081-1/+1
| * | | | Don't yield on notifying all listenersErik Johnston2015-04-081-4/+36
|/ / / /
* | | | Merge pull request #117 from matrix-org/notifier-leakMark Haines2015-04-081-7/+46
|\ \ \ \
| * | | | Move comment into docstringErik Johnston2015-04-081-5/+2
| * | | | Factor out loops into '_discard_if_notified'Erik Johnston2015-04-081-15/+14
| * | | | Also perform paranoia checks in 'on_new_user_event'Erik Johnston2015-04-081-2/+16
| * | | | Add paranoia checks to make sure that we evict stale NotificationListeners wh...Erik Johnston2015-04-081-5/+31
| * | | | Fix bug where we didn't inform the NotificataionListeners about new rooms the...Erik Johnston2015-04-081-0/+3
* | | | | Move database timer logging to seperate loggerErik Johnston2015-04-081-1/+2
* | | | | typoMatthew Hodgson2015-04-081-1/+1
|/ / / /
* | | | Fix --enable-registration flag to work if you don't give a valueErik Johnston2015-04-072-3/+3
* | | | Make demo script use --enable-registrationErik Johnston2015-04-071-1/+1
* | | | Fix a bug which causes a send event level of 0 to not be honoured.Kegan Dougal2015-04-071-1/+1
* | | | update leo's contribs a bitMatthew Hodgson2015-04-031-1/+1
* | | | potential contributing guide & author list for synapseMatthew Hodgson2015-04-033-0/+158
* | | | Appease pep8Paul "LeoNerd" Evans2015-04-011-0/+1
* | | | Report process open filehandles in metricsPaul "LeoNerd" Evans2015-04-011-0/+34
* | | | Fix more AS sender ID thinkos.Kegan Dougal2015-04-012-2/+12
* | | | Merge pull request #116 from matrix-org/application-services-registration-scriptKegsay2015-04-0112-456/+160
|\ \ \ \
| * \ \ \ Merge branch 'develop' into application-services-registration-scriptKegan Dougal2015-04-013-1/+24
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Fix thinko whereby events *for the AS specifically* were not passed on.Kegan Dougal2015-03-312-1/+17
* | | | | Add note in changelog about change in config option namesErik Johnston2015-03-301-0/+7
| * | | | Add same user_id char checks as registration.Kegan Dougal2015-03-311-1/+7
| * | | | Use a sender localpart instead of a user ID.Kegan Dougal2015-03-312-4/+11
| * | | | PyflakesKegan Dougal2015-03-311-2/+1
| * | | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests.Kegan Dougal2015-03-313-28/+40
| * | | | Fix tests and missing returns on deferreds.Kegan Dougal2015-03-313-20/+41
| * | | | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-313-236/+59
| * | | | Remove appservice REST servletsKegan Dougal2015-03-316-196/+0
| * | | | Add AppServiceConfigKegan Dougal2015-03-312-1/+33
|/ / / /
* | | | actually tell users /how/ to turn on registrationMatthew Hodgson2015-03-301-1/+2
* | | | turn --disable-registration into --enable-registration, given the default is ...Matthew Hodgson2015-03-301-11/+11
* | | | Revert "Add another @cached wrapper, this time on get_presence_state()"Paul "LeoNerd" Evans2015-03-271-8/+2
* | | | Add another @cached wrapper, this time on get_presence_state()Paul "LeoNerd" Evans2015-03-271-2/+8
* | | | Merge pull request #115 from matrix-org/allow_registration_for_federation_demoErik Johnston2015-03-271-0/+1
|\ \ \ \
| * | | | Allow registration in the HSes federation demomanuroe2015-03-271-0/+1
|/ / / /
* | | | Merge pull request #106 from matrix-org/application-services-txn-reliabilityKegsay2015-03-2611-42/+1171
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixes from PR commentsKegan Dougal2015-03-262-3/+4
| * | | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-2645-727/+1247
| |\ \ \ | |/ / / |/| | |
* | | | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()Paul "LeoNerd" Evans2015-03-252-8/+34
* | | | Implement the 'key in dict' test for LruCache()Paul "LeoNerd" Evans2015-03-251-0/+7
* | | | Unit-test that Cache() key eviction is orderedPaul "LeoNerd" Evans2015-03-251-0/+18
* | | | Reduce activity timer granularity to avoid too many quick updates (SYN-247)Paul "LeoNerd" Evans2015-03-231-0/+8
| |_|/ |/| |
* | | Put a cache on get_aliases_for_roomPaul "LeoNerd" Evans2015-03-201-2/+8
* | | Remember the 'last seen' time for a given user/IP/device combination and only...Paul "LeoNerd" Evans2015-03-201-2/+30
* | | Pull out the cache logic from the @cached wrapper into its own class we can r...Paul "LeoNerd" Evans2015-03-202-36/+87
* | | func(*EXPR) is valid Python syntax, really...Paul "LeoNerd" Evans2015-03-201-2/+1
* | | Merge pull request #113 from matrix-org/store_rearrangementErik Johnston2015-03-2020-621/+677
|\ \ \
| * | | PEP8Erik Johnston2015-03-201-1/+1
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into store_rearrangementErik Johnston2015-03-203-14/+30
| |\ \ \ | |/ / / |/| | |
* | | | Add the tiniest of tiny one-element caches to get_room_events_max_id() as it'...Paul "LeoNerd" Evans2015-03-202-1/+3
* | | | Allow @cached-wrapped functions to have more or fewer than 1 argument; assert...Paul "LeoNerd" Evans2015-03-201-13/+27
| |_|/ |/| |
| * | Give sensible names for '_simple_...' transactionsErik Johnston2015-03-2013-38/+93
| * | Start removing TablesErik Johnston2015-03-202-26/+29
| * | Tidy up _simple_... methodsErik Johnston2015-03-204-42/+62
| * | Rearrange storage modulesErik Johnston2015-03-207-515/+493
|/ /
* | Merge pull request #112 from matrix-org/hotfixes-v0.8.1-r2 v0.8.1-r2Erik Johnston2015-03-192-1/+2
|\ \
| * | Bump versionErik Johnston2015-03-191-1/+1
| * | Add missing servlet to listErik Johnston2015-03-191-0/+1
|/ /
* | Merge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse v0.8.1-r1Erik Johnston2015-03-192-2/+2
|\ \
| * | Bump versionErik Johnston2015-03-191-1/+1
| * | D'oh - setup.py used the dict directly: make it use the wrapper function.David Baker2015-03-191-1/+1
|/ /
* | Merge branch 'release-v0.8.1' of github.com:matrix-org/synapse v0.8.1Erik Johnston2015-03-1961-425/+1542
|\ \
| * | Update CHANGESErik Johnston2015-03-181-0/+9
| * | Bump versionErik Johnston2015-03-181-1/+1
| * | Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-189-17/+272
| |\ \
| | * | Factor out user id validation checksErik Johnston2015-03-182-9/+13
| | * | Do more validation of incoming requestErik Johnston2015-03-181-3/+3
| | * | Comment.Erik Johnston2015-03-161-0/+3
| | * | Use 403 instead of 400Erik Johnston2015-03-161-1/+1
| | * | Add note about disabling registration by defaultErik Johnston2015-03-131-0/+11
| | * | Allow enabling of registration with --disable-registration falseErik Johnston2015-03-131-2/+8
| | * | Rename register script to 'register_new_matrix_user'Erik Johnston2015-03-132-1/+1
| | * | Change default server url to match default portsErik Johnston2015-03-131-2/+2
| | * | PEP8Erik Johnston2015-03-131-1/+1
| | * | Add 'register_new_user' scriptErik Johnston2015-03-132-1/+150
| | * | Add missing commasErik Johnston2015-03-131-2/+2
| | * | Implement registering with shared secret.Erik Johnston2015-03-134-5/+83
| | * | Disable registration by defaultErik Johnston2015-03-131-0/+4
| * | | Clean out event_forward_extremities table when the server rejoins the roomErik Johnston2015-03-182-0/+14
| * | | @cached() annotate get_user_by_token() - achieves a minor DB performance impr...Paul "LeoNerd" Evans2015-03-172-2/+7
| * | | Be polite and ensure we use @functools.wraps() when creating a function decor...Paul "LeoNerd" Evans2015-03-171-0/+2
| * | | pep8David Baker2015-03-171-2/+3
| * | | Wire up the webclient optionDavid Baker2015-03-173-8/+24
| * | | Add a DistributionMetric to HTTP request/response processing time in the serverPaul "LeoNerd" Evans2015-03-161-0/+9
| * | | Add a metric for the scheduling latency of SQL queriesPaul "LeoNerd" Evans2015-03-161-0/+5
| * | | Merge pull request #110 from matrix-org/fix_banErik Johnston2015-03-166-52/+32
| |\ \ \
| | * | | Fix testsErik Johnston2015-03-161-1/+1
| | * | | Copy dict of context.current_state before changing it.Erik Johnston2015-03-161-1/+1
| | * | | Revert incorrect changes to where we send eventsErik Johnston2015-03-161-3/+4
| | * | | Remove concept of context.auth_events, instead use context.current_stateErik Johnston2015-03-165-33/+7
| | * | | Fix testErik Johnston2015-03-161-1/+1
| | * | | Send all membership events to the remote homeserverErik Johnston2015-03-161-4/+3
| | * | | Make context.auth_events grap auth events from current state. Otherwise auth ...Erik Johnston2015-03-162-18/+12
| | * | | Respect ban membershipErik Johnston2015-03-161-5/+17
| |/ / / |/| | |
* | | | Merge branch 'release-v0.8.0' of github.com:matrix-org/synapse v0.8.0Erik Johnston2015-03-0991-925/+2909
|\ \ \ \
| | * \ \ Merge pull request #111 from matrix-org/send_event_dont_wait_on_notifierErik Johnston2015-03-161-1/+10
| | |\ \ \
| | | * | | Don't block waiting on waking up all the listeners when sending an event.Erik Johnston2015-03-161-1/+10
| | |/ / /
| | | | * Set the service ID as soon as it is known.Kegan Dougal2015-03-162-4/+5
| | | | * Implement ServiceQueuer with tests.Kegan Dougal2015-03-162-23/+77
| | | | * Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ...Kegan Dougal2015-03-162-101/+60
| | | | * Wrap polling/retry blocks in try/excepts to avoid sending to other ASes break...Kegan Dougal2015-03-161-29/+39
| | | | * Minor PR comment tweaks.Kegan Dougal2015-03-165-13/+19
| | | | * Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-1645-373/+1193
| | | | |\ | | | |_|/ | | |/| |
| | * | | add ToC and fix typoeMatthew Hodgson2015-03-141-1/+4
| | * | | actually uphold the bind_host parameter. in theory should make ipv6 binds wor...Matthew Hodgson2015-03-142-3/+13
| | * | | uncommited WIP from MWCMatthew Hodgson2015-03-142-12/+15
| | * | | Merge pull request #108 from matrix-org/metricsPaul Evans2015-03-1320-44/+790
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge remote-tracking branch 'origin/develop' into metricsPaul "LeoNerd" Evans2015-03-121-2/+8
| | | |\ \
| | | * | | Appease pyflakesPaul "LeoNerd" Evans2015-03-121-1/+1
| | | * | | Delete unused import of NOT_READY_YETPaul "LeoNerd" Evans2015-03-121-1/+0
| | | * | | Appease pep8Paul "LeoNerd" Evans2015-03-129-27/+46
| | | * | | Option to serve metrics from their own localhost-only TCP port instead of mux...Paul "LeoNerd" Evans2015-03-122-2/+15
| | | * | | Fold the slightly-odd bind_port/secure_port/etc.. logic into SynapseHomeServe...Paul "LeoNerd" Evans2015-03-121-12/+11
| | | * | | Build MetricsResource as a specific HomeServer dependencyPaul "LeoNerd" Evans2015-03-122-6/+11
| | | * | | Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the to...Paul "LeoNerd" Evans2015-03-121-7/+5
| | | * | | Neater metrics from TransactionQueuePaul "LeoNerd" Evans2015-03-121-9/+11
| | | * | | Add a counter to track total number of events served by the notifierPaul "LeoNerd" Evans2015-03-121-0/+3
| | | * | | Replace the @metrics.counted annotations in federation with specifically-writ...Paul "LeoNerd" Evans2015-03-123-41/+29
| | | * | | Add an .inc_by() method to CounterMetric; implement DistributionMetric a neat...Paul "LeoNerd" Evans2015-03-122-26/+16
| | | * | | Rename the timer metrics exported by synapse.storage to append _time, so the ...Paul "LeoNerd" Evans2015-03-121-3/+3
| | | * | | Don't forbid '_' in metric basenames any more, to allow things like foo_timePaul "LeoNerd" Evans2015-03-121-5/+0
| | | * | | Rename TimerMetric to DistributionMetric; as it could count more than just timePaul "LeoNerd" Evans2015-03-124-33/+37