summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 10 mins seems more reasonable that every minuteNeil Johnson2018-05-011-1/+1
|
* pep8Neil Johnson2018-04-251-3/+4
|
* Generate user daily statsNeil Johnson2018-04-256-5/+112
|
* ignore atom editor python ide filesNeil Johnson2018-04-251-0/+1
|
* Merge branch 'master' into developNeil Johnson2018-04-242-3/+44
|\
| * Bump version and update changelog v0.28.0-rc1Neil Johnson2018-04-242-3/+44
| |
* | Revert "Bump version and update changelog"Neil Johnson2018-04-242-41/+3
| | | | | | | | This reverts commit 08b29d45749d1944965e8d203155a4ea45a15423.
* | Bump version and update changelogNeil Johnson2018-04-242-3/+41
|/
* Merge pull request #3118 from matrix-org/rav/reject_prev_eventsRichard van der Hoff2018-04-232-9/+94
|\ | | | | Reject events which have lots of prev_events
| * Remove spurious paramRichard van der Hoff2018-04-231-1/+0
| |
| * accept stupid events over backfillRichard van der Hoff2018-04-201-4/+9
| |
| * Add some commentsRichard van der Hoff2018-04-182-5/+35
| |
| * Check events on backfill tooRichard van der Hoff2018-04-181-15/+42
| |
| * Reject events which have too many auth_events or prev_eventsRichard van der Hoff2018-04-181-4/+28
| | | | | | | | | | ... this should protect us from being dossed by people making silly events (deliberately or otherwise)
* | Merge pull request #3109 from NotAFile/py3-tests-fixRichard van der Hoff2018-04-235-5/+6
|\ \ | | | | | | Make tests py3 compatible
| * | Make tests py3 compatibleAdrian Tschira2018-04-165-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a mixed commit that fixes various small issues * print parentheses * 01 is invalid syntax (it was octal in py2) * [x for i in 1, 2] is invalid syntax * six moves Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | Merge pull request #3106 from NotAFile/py3-six-itervalues-1Richard van der Hoff2018-04-204-11/+18
|\ \ \ | | | | | | | | Use six.itervalues in some places
| * | | Use six.itervalues in some placesAdrian Tschira2018-04-154-11/+18
| |/ / | | | | | | | | | | | | | | | There's more where that came from Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | Merge pull request #3107 from NotAFile/py3-bool-nonzeroRichard van der Hoff2018-04-203-0/+9
|\ \ \ | | | | | | | | add __bool__ alias to __nonzero__ methods
| * | | add __bool__ alias to __nonzero__ methodsAdrian Tschira2018-04-153-0/+9
| |/ / | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | Merge pull request #3104 from NotAFile/py3-unittest-configRichard van der Hoff2018-04-201-0/+4
|\ \ \ | | | | | | | | Add some more variables to the unittest config
| * | | Add some more variables to the unittest configAdrian Tschira2018-04-151-0/+4
| |/ / | | | | | | | | | | | | | | | | | | These worked accidentally before (python2 doesn't complain if you compare incompatible types) but under py3 this blows up spectacularly Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | Merge pull request #3110 from NotAFile/py3-six-queueRichard van der Hoff2018-04-202-4/+6
|\ \ \ | | | | | | | | Replace Queue with six.moves.queue
| * | | Replace Queue with six.moves.queueAdrian Tschira2018-04-162-4/+6
| |/ / | | | | | | | | | | | | | | | and a six.range change which I missed the last time Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | Merge pull request #3103 from NotAFile/py3-baseexcepton-messageRichard van der Hoff2018-04-202-10/+10
|\ \ \ | | | | | | | | Use str(e) instead of e.message
| * | | Use str(e) instead of e.messageAdrian Tschira2018-04-152-10/+10
| |/ / | | | | | | | | | | | | | | | | | | Doing this I learned e.message was pretty shortlived, added in 2.6, they realized it was a bad idea and deprecated it in 2.7 Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | Merge pull request #3100 from silkeh/readme-srv-cnameErik Johnston2018-04-201-0/+3
|\ \ \ | | | | | | | | Clarify that SRV may not point to a CNAME
| * | | Clarify that SRV may not point to a CNAMESilke2018-04-141-0/+3
| |/ / | | | | | | | | | Signed-off-by: Silke Hofstra <silke@slxh.eu>
* | | Merge pull request #3125 from matrix-org/erikj/add_contrib_docsErik Johnston2018-04-202-0/+14
|\ \ \ | | | | | | | | Document contrib directory
| * | | Document contrib directoryErik Johnston2018-04-202-0/+14
|/ / /
* | | Merge pull request #3093 from matrix-org/rav/response_cache_wrapRichard van der Hoff2018-04-206-79/+111
|\ \ \ | | | | | | | | Refactor ResponseCache usage
| * | | Reinstate linearizer for federation_server.on_context_state_requestRichard van der Hoff2018-04-201-5/+11
| | | |
| * | | ResponseCache: fix handling of completed resultsRichard van der Hoff2018-04-131-13/+19
| | | | | | | | | | | | | | | | | | | | Turns out that ObservableDeferred.observe doesn't return a deferred if the result is already completed. Fix handling and improve documentation.
| * | | Refactor ResponseCache usageRichard van der Hoff2018-04-126-67/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a `.wrap` method to ResponseCache which wraps up the boilerplate of a (get, set) pair, and then use it throughout the codebase. This will be largely non-functional, but does include the following functional changes: * federation_server.on_context_state_request: drops use of _server_linearizer which looked redundant and could cause incorrect cache misses by yielding between the get and the set. * RoomListHandler.get_remote_public_room_list(): fixes logcontext leaks * the wrap function includes some logging. I'm hoping this won't be too noisy on production.
* | | | Merge pull request #3117 from matrix-org/rav/refactor_have_eventsRichard van der Hoff2018-04-203-27/+55
|\ \ \ \ | | | | | | | | | | Refactor store.have_events
| * | | | Refactor store.have_eventsRichard van der Hoff2018-04-203-27/+55
| | |_|/ | |/| | | | | | | | | | | | | | | | | | It turns out that most of the time we were calling have_events, we were only using half of the result. Replace have_events with have_seen_events and get_rejection_reasons, so that we can see what's going on a bit more clearly.
* | | | Merge pull request #3113 from matrix-org/rav/fix_huge_prev_eventsRichard van der Hoff2018-04-184-54/+162
|\ \ \ \ | |/ / / |/| | | Avoid creating events with huge numbers of prev_events
| * | | Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-164-54/+162
|/ / / | | | | | | | | | | | | | | | In most cases, we limit the number of prev_events for a given event to 10 events. This fixes a particular code path which created events with huge numbers of prev_events.
* | / fix spurious changelog dupMatthew Hodgson2018-04-151-1/+0
| |/ |/|
* | Merge branch 'master' of https://github.com/matrix-org/synapse into developNeil Johnson2018-04-133-2/+10
|\ \
| * \ Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapseNeil Johnson2018-04-133-2/+10
| |\ \
| | * | Bump version and Change log v0.27.4 github/release-v0.27.0 release-v0.27.0Neil Johnson2018-04-132-1/+9
| | | |
| | * | Merge pull request #3095 from matrix-org/rav/bump_canonical_jsonNeil Johnson2018-04-131-1/+1
| | |\ \ | | | | | | | | | | Update canonicaljson dependency
| | | * | Bump canonicaljson to 1.1.3Richard van der Hoff2018-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | 1.1.2 was a bit broken too :/
| | | * | Update canonicaljson dependencyRichard van der Hoff2018-04-121-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 1.1.0 and 1.1.1 were broken, so we're updating this to help people make sure they don't end up on a broken version. Also, 1.1.0 is speedier...
* | | | Merge pull request #3099 from matrix-org/matthew/fix-federation-domain-whitelistMatthew Hodgson2018-04-131-6/+6
|\ \ \ \ | | | | | | | | | | fix federation_domain_whitelist
| * | | | fix federation_domain_whitelistMatthew Hodgson2018-04-131-6/+6
|/ / / / | | | | | | | | | | | | we were checking the wrong server_name on inbound requests
* | | | revert last to PR properlyMatthew Hodgson2018-04-131-6/+6
| | | |
* | | | correctly auth inbound federation_domain_whitelist reqsMatthew Hodgson2018-04-131-6/+6
| | | |
* | | | Merge branch 'master' of https://github.com/matrix-org/synapse into developNeil Johnson2018-04-133-3/+11
|\| | |
| * | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3Neil Johnson2018-04-1151-278/+956
| |\| |
| | * | bump version/changelogNeil Johnson2018-04-112-1/+9
| | | |
| | * | Merge commit '11d2609da70af797405241cdf7d9df19db5628f2' of ↵Neil Johnson2018-04-111-48/+80
| | |\ \ | | | | | | | | | | | | | | | https://github.com/matrix-org/synapse into release-v0.27.0
| * | | | Update README.rstNeil Johnson2018-03-281-2/+2
| | | | | | | | | | | | | | | update docker hub url
* | | | | Revert "Use sortedcontainers instead of blist"Richard van der Hoff2018-04-133-10/+10
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9fbe70a7dc3afabfdac176ba1f4be32dd44602aa. It turns out that sortedcontainers.SortedDict is not an exact match for blist.sorteddict; in particular, `popitem()` removes things from the opposite end of the dict. This is trivial to fix, but I want to add some unit tests, and potentially some more thought about it, before we do so.
* | | | Merge pull request #3092 from matrix-org/rav/response_cache_metricsRichard van der Hoff2018-04-126-7/+21
|\ \ \ \ | | | | | | | | | | Add metrics for ResponseCache
| * | | | Add metrics for ResponseCacheRichard van der Hoff2018-04-106-7/+21
| | | | |
* | | | | Merge pull request #3090 from matrix-org/erikj/processed_event_lagErik Johnston2018-04-127-5/+121
|\ \ \ \ \ | | | | | | | | | | | | Add metrics for event processing lag
| * | | | | Format docstringErik Johnston2018-04-121-2/+3
| | | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-04-122-2/+51
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | erikj/processed_event_lag
* | | | | | Merge pull request #3059 from matrix-org/rav/doc_response_cacheRichard van der Hoff2018-04-121-0/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Document the behaviour of ResponseCache
| * | | | | | Document the behaviour of ResponseCacheRichard van der Hoff2018-04-041-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it looks like everything that uses ResponseCache expects to have to `make_deferred_yieldable` its results. It's debatable whether that is the best approach, but let's document it for now to avoid further confusion.
* | | | | | | Merge pull request #3088 from matrix-org/erikj/as_parallelErik Johnston2018-04-121-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Send events to ASes concurrently
| * | | | | | | Send events to ASes concurrentlyErik Johnston2018-04-111-2/+19
| | | | | | | |
| | | * | | | | Doc we raise on unknown eventErik Johnston2018-04-121-2/+3
| | | | | | | |
| | | * | | | | s/list/tupleErik Johnston2018-04-121-2/+2
| | | | | | | |
| | | * | | | | Set all metrics at the same timeErik Johnston2018-04-122-10/+10
| | | | | | | |
| | | * | | | | Fix testsErik Johnston2018-04-111-0/+1
| | | | | | | |
| | | * | | | | Track last processed event received_tsErik Johnston2018-04-114-0/+52
| | | | | | | |
| | | * | | | | Track where event stream processing have gotten up toErik Johnston2018-04-114-0/+24
| | | | | | | |
| | | * | | | | Add GaugeMetricErik Johnston2018-04-112-1/+38
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #2760 from Valodim/pypyRichard van der Hoff2018-04-117-13/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Synapse on PyPy
| * | | | | | | Don't disable GC when running on PyPyVincent Breitmoser2018-04-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PyPy's incminimark GC can't be triggered manually. From what I observed there are no obvious issues with just letting it run normally. And unlike CPython, it actually returns unused RAM to the system. Signed-off-by: Vincent Breitmoser <look@my.amazin.horse>
| * | | | | | | In DomainSpecificString, override __repr__ in addition to __str__Vincent Breitmoser2018-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, string interpolation on a DomainSpecificString object like "%r" % (domainSpecificStringObj) fails under PyPy, because the default __repr__ implementation wants to iterate over the object. I'm not sure why that happens, but overriding __repr__ instead of __str__ fixes this problem, and is arguably the more appropriate thing to do anyways.
| * | | | | | | Fix pep8 error on psycopg2cffi hackRichard van der Hoff2018-04-101-6/+5
| | | | | | | |
| * | | | | | | Use psycopg2cffi module instead of psycopg2 if running on pypyVincent Breitmoser2018-04-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The psycopg2 package isn't available for PyPy. This commit adds a check if the runtime is PyPy, and if it is uses psycopg2cffi module in favor of psycopg2. This is almost a drop-in replacement, except for one place where an additional cast to string is required.
| * | | | | | | Use sortedcontainers instead of blistVincent Breitmoser2018-04-103-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit drop-in replaces blist with SortedContainers. They are written in pure python so work with pypy, but perform as good as native implementations, at least in a couple benchmarks: http://www.grantjenks.com/docs/sortedcontainers/performance.html
* | | | | | | | Merge pull request #3086 from matrix-org/r30_statsMatthew Hodgson2018-04-101-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix typo
| * | | | | | | | fix typoNeil Johnson2018-04-101-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sendsErik Johnston2018-04-102-55/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Limit concurrent event sends for a room
| * | | | | | | | Note why we're limiting concurrent event sendsErik Johnston2018-04-101-0/+5
| | | | | | | | |
| * | | | | | | | Limit concurrent event sends for a roomErik Johnston2018-04-091-49/+50
| | | | | | | | |
| * | | | | | | | Use create_and_send_nonmember_event everywhereErik Johnston2018-04-091-6/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #3078 from matrix-org/erikj/federation_senderErik Johnston2018-04-101-15/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Send federation events concurrently
| * | | | | | | | | Use run_in_background insteadErik Johnston2018-04-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Preserve log contexts correctlyErik Johnston2018-04-101-1/+4
| | | | | | | | | |
| * | | | | | | | | Log event ID on exceptionErik Johnston2018-04-101-1/+4
| | | | | | | | | |
| * | | | | | | | | Handle all events in a room correctlyErik Johnston2018-04-091-1/+2
| | | | | | | | | |
| * | | | | | | | | Send federation events concurrentlyErik Johnston2018-04-091-4/+18
| | | | | | | | | |
| * | | | | | | | | Handle exceptions in get_hosts_for_room when sending events over federationErik Johnston2018-04-091-11/+16
| |/ / / / / / / /
* | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-04-103-7/+62
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | develop
| * | | | | | | remove errant print v0.27.3-rc2Neil Johnson2018-04-091-1/+1
| | | | | | | |
| * | | | | | | Fix msec to sec, againNeil Johnson2018-04-091-3/+3
| | | | | | | |
| * | | | | | | Fix msec to secNeil Johnson2018-04-091-1/+1
| | | | | | | |
| * | | | | | | v0.27.3-rc2Neil Johnson2018-04-091-0/+5
| | | | | | | |
| * | | | | | | Fix psycopg2 interpolationNeil Johnson2018-04-091-5/+5
| | | | | | | |
| * | | | | | | version bump v0.27.3-rc2Neil Johnson2018-04-091-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-04-0935-186/+728
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | release-v0.27.0
| * \ \ \ \ \ \ \ Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-04-091-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-v0.27.0
| | * | | | | | | | Update CHANGES.rstNeil Johnson2018-04-091-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-04-091-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-v0.27.0
| | * | | | | | | | Update CHANGES.rstNeil Johnson2018-04-091-1/+2
| | | | | | | | | |
| | * | | | | | | | Update CHANGES.rstNeil Johnson2018-04-091-3/+6
| | | | | | | | | |
| * | | | | | | | | bump version to release candidateNeil Johnson2018-04-091-1/+1
| |/ / / / / / / /
| * | | | | | | | bump version v0.27.3-rc1Neil Johnson2018-04-091-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into release-v0.27.0Neil Johnson2018-04-0920-47/+88
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 0.27.3Neil Johnson2018-04-091-0/+46
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3082 from matrix-org/erikj/urlencode_pathsErik Johnston2018-04-101-48/+80
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | URL quote path segments over federation
| * | | | | | | | Ensure slashes are escapedErik Johnston2018-04-101-1/+1
| | | | | | | | |
| * | | | | | | | URL quote path segments over federationErik Johnston2018-04-101-48/+80
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-103-34/+35
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | move handling of auto_join_rooms to RegisterHandler
| * | | | | | | Merge branch 'develop' of into allow_auto_join_roomsKrombel2018-03-2853-111/+264
| |\ \ \ \ \ \ \
| * | | | | | | | move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-143-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de>
* | | | | | | | | Merge pull request #3061 from NotAFile/add-some-byte-stringsRichard van der Hoff2018-04-096-14/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add b prefixes to some strings that are bytes in py3
| * | | | | | | | | Add b prefixes to some strings that are bytes in py3Adrian Tschira2018-04-046-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | Merge pull request #3073 from NotAFile/use-six-reraiseRichard van der Hoff2018-04-091-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Replace old-style raise with six.reraise
| * | | | | | | | | | Replace old-style raise with six.reraiseAdrian Tschira2018-04-061-1/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old style raise is invalid syntax in python3. As noted in the docs, this adds one more frame in the traceback, but I think this is acceptable: <ipython-input-7-bcc5cba3de3f> in <module>() 16 except: 17 pass ---> 18 six.reraise(*x) /usr/lib/python3.6/site-packages/six.py in reraise(tp, value, tb) 691 if value.__traceback__ is not tb: 692 raise value.with_traceback(tb) --> 693 raise value 694 finally: 695 value = None <ipython-input-7-bcc5cba3de3f> in <module>() 9 10 try: ---> 11 x() 12 except: 13 x = sys.exc_info() Also note that this uses six, which is not formally a dependency yet, but is included indirectly since most packages depend on it. Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | Merge pull request #2938 from dklug/developRichard van der Hoff2018-04-091-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Return 401 for invalid access_token on logout
| * | | | | | | | | | Return 401 for invalid access_token on logoutdklug2018-03-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Duncan Klug <dklug@ucmerced.edu>
* | | | | | | | | | | Merge pull request #3074 from NotAFile/fix-py3-printsRichard van der Hoff2018-04-091-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use python3-compatible prints
| * | | | | | | | | | | use python3-compatible printsAdrian Tschira2018-04-061-5/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3075 from NotAFile/six-type-checksRichard van der Hoff2018-04-095-8/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace some type checks with six type checks
| * | | | | | | | | | | Replace some type checks with six type checksAdrian Tschira2018-04-075-8/+18
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | Merge pull request #3016 from silkeh/improve-service-lookupsRichard van der Hoff2018-04-092-122/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve handling of SRV records for federation connections
| * | | | | | | | | | | Remove address resolution of hosts in SRV recordsSilke2018-04-042-122/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke Hofstra <silke@slxh.eu>
* | | | | | | | | | | | Merge pull request #3069 from krombel/update_prometheus_configRichard van der Hoff2018-04-093-19/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | update prometheus dashboard to use new metric names
| * | | | | | | | | | | | make prometheus config compliant to v0.28Krombel2018-04-053-19/+19
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoinRichard van der Hoff2018-04-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Return a 404 rather than a 500 on rejoining empty rooms
| * | | | | | | | | | | | Return a 404 rather than a 500 on rejoining empty roomsRichard van der Hoff2018-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter ourselves out of the server list before checking for an empty remote host list, to fix 500 error Fixes #2141
* | | | | | | | | | | | | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics"Richard van der Hoff2018-04-095-28/+52
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We aren't ready to release this yet, so I'm reverting it for now. This reverts commit d1679a4ed7947b0814e0f2af9b888a16c588f1a1, reversing changes made to e089100c6231541c446e37e157dec8feed02d283.
* | | | | | | | | | | | Merge pull request #3046 from matrix-org/dbkr/join_groupLuke Barnard2018-04-065-25/+133
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Implement group join API
| * | | | | | | | | | | | de-lint, quote consistencyLuke Barnard2018-04-061-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Explicitly grab individual columns from group objectLuke Barnard2018-04-061-6/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | When exposing group state, return is_openly_joinableLuke Barnard2018-04-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as opposed to join_policy, which is really only pertinent to the synapse implementation of the group server. By doing this we keep the group server concept extensible by allowing arbitrarily complex rules for deciding whether a group is openly joinable.
| * | | | | | | | | | | | By default, join policy is "invite"Luke Barnard2018-04-061-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | add_user -> _add_userLuke Barnard2018-04-061-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | pep8Luke Barnard2018-04-062-2/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Get group_info from existing call to check_group_is_oursLuke Barnard2018-04-061-5/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don't use redundant inlineCallbacksLuke Barnard2018-04-061-4/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | join_rule -> join_policyLuke Barnard2018-04-061-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | is_joinable -> join_ruleLuke Barnard2018-04-062-5/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix federation client `set_group_joinable` typoLuke Barnard2018-04-061-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Factor out add_user from accept_invite and join_groupLuke Barnard2018-04-061-41/+29
| | | | | | | | | | | | |
| * | | | | | | | | | | | pep8David Baker2018-04-061-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Implement group join APIDavid Baker2018-04-065-4/+124
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3071 from matrix-org/erikj/resp_size_metricsErik Johnston2018-04-061-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add response size metrics
| * | | | | | | | | | | | | Add response size metricsErik Johnston2018-04-061-0/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3072 from matrix-org/rav/fix_port_scriptRichard van der Hoff2018-04-061-33/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | postgres port script: fix state_groups_pkey error
| * | | | | | | | | | | | Port script: Set up state_group_id_seqRichard van der Hoff2018-04-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3050.
| * | | | | | | | | | | | Port script: clean up a bitRichard van der Hoff2018-04-061-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve logging and comments. Group all the stuff to do with inspecting tables together rather than creating the port tables in the middle.
| * | | | | | | | | | | | Port script: avoid nasty errors when setting upRichard van der Hoff2018-04-061-8/+6
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't spit out "Failed to create port table", it looks scary.
* | | | | | | | | | | | Merge pull request #3070 from krombel/group_join_put_instead_postErik Johnston2018-04-063-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | use PUT instead of POST for federating groups/m.join_policy
| * | | | | | | | | | | use PUT instead of POST for federating groups/m.join_policyKrombel2018-04-063-3/+7
|/ / / / / / / / / / /
* | | | | | | | | | | more verbosity in synctlRichard van der Hoff2018-04-061-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #2886 from turt2live/travis/new-worker-docsRichard van der Hoff2018-04-051-2/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a blurb explaining the main synapse worker
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docsTravis Ralston2018-04-04126-2530/+3869
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Document the additional routes for the event_creator workerTravis Ralston2018-04-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3018 Signed-off-by: Travis Ralston <travpc@gmail.com>
| * | | | | | | | | | | | Move the mention of the main synapse worker higher upTravis Ralston2018-04-041-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Travis Ralston <travpc@gmail.com>
| * | | | | | | | | | | | Add a blurb explaining the main synapse workerTravis Ralston2018-02-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Travis Ralston <travpc@gmail.com>
* | | | | | | | | | | | | Merge pull request #2986 from jplatte/join_reponse_room_idRichard van der Hoff2018-04-051-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add room_id to the response of `rooms/{roomId}/join`
| * | | | | | | | | | | | | Add room_id to the response of `rooms/{roomId}/join`Jonas Platte2018-03-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2349
* | | | | | | | | | | | | | Merge pull request #3068 from matrix-org/rav/fix_cache_invalidationRichard van der Hoff2018-04-052-26/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve database cache performance
| * | | | | | | | | | | | | | Fix overzealous cache invalidationRichard van der Hoff2018-04-052-26/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where a cache invalidation would invalidate *all* pending entries, rather than just the entry that we intended to invalidate.
* | | | | | | | | | | | | | | Merge pull request #3066 from matrix-org/rav/remove_redundant_metricsRichard van der Hoff2018-04-055-52/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | Remove redundant metrics which were deprecated in 0.27.0.
| * | | | | | | | | | | | | | Remove redundant metrics which were deprecated in 0.27.0.Richard van der Hoff2018-04-045-52/+28
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3045 from matrix-org/dbkr/group_joinableLuke Barnard2018-04-058-0/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add joinability for groups
| * | | | | | | | | | | | | | NON NULL -> NOT NULLLuke Barnard2018-04-051-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use "/settings/" (plural)Luke Barnard2018-04-053-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use DEFAULT join_policy of "invite" in dbLuke Barnard2018-04-051-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Document set_group_join_policyLuke Barnard2018-04-051-0/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use join_policy API instead of joinableLuke Barnard2018-04-037-23/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open".
| * | | | | | | | | | | | | | This should probably be a PUTDavid Baker2018-03-281-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | OK, smallint it is thenDavid Baker2018-03-281-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Grr. Copy the definition from is_adminDavid Baker2018-03-281-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | pep8David Baker2018-03-281-2/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make column definition that works on both dbsDavid Baker2018-03-281-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add schema delta fileDavid Baker2018-03-281-0/+16
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add joinability for groupsDavid Baker2018-03-287-1/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds API to set the 'joinable' flag, and corresponding flag in the table.
* | | | | | | | | | | | | | | Merge pull request #3041 from matrix-org/r30_statsNeil Johnson2018-04-055-7/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | R30 stats
| * | | | | | | | | | | | | | | Review commentsNeil Johnson2018-04-052-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use iteritems over item to loop over dict formatting
| * | | | | | | | | | | | | | | pep8Neil Johnson2018-03-291-2/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove need for sqlite specific queryNeil Johnson2018-03-291-30/+57
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix pep8 errorsNeil Johnson2018-03-281-3/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | remove twisted deferral cruftNeil Johnson2018-03-281-6/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | bump schema versionNeil Johnson2018-03-281-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Support multi client R30 for psqlNeil Johnson2018-03-282-9/+31
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | rename stat to future proofNeil Johnson2018-03-281-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add user_ips last seen indexNeil Johnson2018-03-282-0/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | No need to cast in count_daily_usersNeil Johnson2018-03-281-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | query and call for r30 statsNeil Johnson2018-03-282-0/+38
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | count_daily_users failed if db was sqlite due to type failure - presumably ↵Neil Johnson2018-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this prevcented all sqlite homeservers reporting home
* | | | | | | | | | | | | | | | Merge pull request #3060 from matrix-org/rav/kill_event_contentRichard van der Hoff2018-04-053-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Remove uses of events.content
| * | | | | | | | | | | | | | | Remove uses of events.contentRichard van der Hoff2018-03-293-7/+12
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3063 from matrix-org/jcgruenhage/cache_settings_statsJan Christian Grünhage2018-04-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | phone home cache size configurations
| * | | | | | | | | | | | | | phone home cache size configurationsJan Christian Grünhage2018-04-041-0/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-checkRichard van der Hoff2018-04-041-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | Revert "improve mxid check performance"
| * | | | | | | | | | | | | Revert "improve mxid check performance"Richard van der Hoff2018-04-041-4/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3000 from NotAFile/change-except-styleRichard van der Hoff2018-04-042-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace old style error catching with 'as' keyword
| * | | | | | | | | | | | | replace old style error catching with 'as' keywordNotAFile2018-03-152-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is both easier to read and compatible with python3 (not that that matters) Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | Merge pull request #3044 from matrix-org/michaelk/performance_statsRichard van der Hoff2018-04-042-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic performance statistics to phone home
| * | | | | | | | | | | | | | Handle review commentsMichael Kaye2018-03-281-6/+9
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | As daemonizing will make a new process, defer call to init.Michael Kaye2018-03-281-13/+23
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Include coarse CPU and Memory use in stats callbacks.Michael Kaye2018-03-272-0/+32
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires the psutil module, and is still opt-in based on the report_stats config option.
* | | | | | | | | | | | | | Merge pull request #3053 from NotAFile/speedup-mxid-checkRichard van der Hoff2018-04-041-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | improve mxid check performance
| * | | | | | | | | | | | | improve mxid check performance ~4xAdrian Tschira2018-03-311-3/+4
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | Merge pull request #3049 from matrix-org/rav/use_staticjsonRichard van der Hoff2018-04-034-20/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use static JSONEncoders
| * | | | | | | | | | | | | Fix json encoding bug in replicationRichard van der Hoff2018-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | json encoders have an encode method, not a dumps method.
| * | | | | | | | | | | | | Use static JSONEncodersRichard van der Hoff2018-03-294-20/+34
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using json.dumps with custom options requires us to create a new JSONEncoder on each call. It's more efficient to create one upfront and reuse it.
* | | | | | | | | | | | | Merge pull request #3048 from matrix-org/rav/use_simplejsonRichard van der Hoff2018-04-033-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Use simplejson throughout
| * | | | | | | | | | | | Use simplejson throughoutRichard van der Hoff2018-03-293-5/+9
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use simplejson rather than json, for consistency.
* | | | | | | | | | | | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creationErik Johnston2018-03-281-27/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Measure time it takes to calculate state group ID
| * | | | | | | | | | | | Measure time it takes to calculate state group IDErik Johnston2018-03-281-27/+28
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errorsRichard van der Hoff2018-03-281-28/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Fix error when claiming e2e keys from offline servers
| * | | | | | | | | | | Stringify exceptions for keys/{query,claim}Richard van der Hoff2018-03-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we stringify any exceptions we return from keys/query and keys/claim, to avoid a 'not JSON serializable' error later Fixes #3010
| * | | | | | | | | | | factor out exception handling for keys/claim and keys/queryRichard van der Hoff2018-03-271-28/+25
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this stuff is badly c&p'ed
* | | | | | | | | | | Merge pull request #3042 from matrix-org/fix_locally_failing_testsErik Johnston2018-03-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | fix tests/storage/test_user_directory.py
| * | | | | | | | | | Fix search_user_dir multiple sqlite versions do different thingsNeil Johnson2018-03-282-3/+3
| | | | | | | | | | |
| * | | | | | | | | | fix tests/storage/test_user_directory.pyNeil Johnson2018-03-281-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_idErik Johnston2018-03-282-7/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Linearize calls to _generate_user_id
| * | | | | | | | | | Also do check inside linearizerErik Johnston2018-03-271-3/+4
| | | | | | | | | | |
| * | | | | | | | | | PEP8Erik Johnston2018-03-261-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Don't use _cursor_to_dict in find_next_generated_user_id_localpartErik Johnston2018-03-261-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Linearize calls to _generate_user_idErik Johnston2018-03-261-4/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3030 from matrix-org/erikj/no_ujsonErik Johnston2018-03-282-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove last usage of ujson
| * | | | | | | | | | | Remove last usage of ujsonErik Johnston2018-03-262-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3033 from matrix-org/erikj/calculate_state_metricsErik Johnston2018-03-281-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Add counter metrics for calculating state delta
| * | | | | | | | | | | CommentErik Johnston2018-03-271-4/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Fix indentErik Johnston2018-03-271-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | CommentErik Johnston2018-03-271-0/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Add counter metrics for calculating state deltaErik Johnston2018-03-271-1/+30
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to measure how often we calculate state deltas in event persistence that we would have been able to calculate at the same time we calculated the state for the event.
* | | | | | | | | | | Merge pull request #3017 from matrix-org/erikj/add_cache_control_headersErik Johnston2018-03-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Cache-Control headers to all JSON APIs
| * | | | | | | | | | | Add Cache-Control headers to all JSON APIsErik Johnston2018-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is especially important that sync requests don't get cached, as if a sync returns the same token given then the client will call sync with the same parameters again. If the previous response was cached it will get reused, resulting in the client tight looping making the same request and never making any progress. In general, clients will expect to get up to date data when requesting APIs, and so its safer to do a blanket no cache policy than only whitelisting APIs that we know will break things if they get cached.
* | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-262-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse v0.27.2Erik Johnston2018-03-263-8/+18
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Bum version and changelogErik Johnston2018-03-262-1/+9
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'erikj/simplejson_replication' of github.com:matrix-org/synapse ↵Erik Johnston2018-03-261-7/+9
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into release-v0.27.0
| * | | | | | | | | | Fix date v0.27.1Erik Johnston2018-03-261-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Bump version and changelogErik Johnston2018-03-262-1/+7
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.0Neil Johnson2018-03-26177-4347/+8671
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | version bumpNeil Johnson2018-03-262-1/+7
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | fix typoMatthew Hodgson2018-03-231-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3022 from matrix-org/matthew/noresourceMatthew Hodgson2018-03-2312-24/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | 404 correctly on missing paths via NoResource
| * | | | | | | | | | 404 correctly on missing paths via NoResourceMatthew Hodgson2018-03-2312-24/+24
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes https://github.com/matrix-org/synapse/issues/2043 and https://github.com/matrix-org/synapse/issues/2029
* | | | | | | | | | Merge pull request #3006 from matrix-org/erikj/state_iterErik Johnston2018-03-221-12/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use .iter* to avoid copies in StateHandler
| * | | | | | | | | | Fix s/iteriterms/itervaluesErik Johnston2018-03-221-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use .iter* to avoid copies in StateHandlerErik Johnston2018-03-151-12/+12
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into developErik Johnston2018-03-224-5/+66
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Update CHANGES.rst v0.27.0-rc2Neil Johnson2018-03-201-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | rearrange ordering of releases to match chronology
| * | | | | | | | fix merge conflictsNeil Johnson2018-03-2032-50/+90
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Update __init__.pyNeil Johnson2018-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bump version
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 16:12:45 +0000