summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* CommentErik Johnston2018-05-221-1/+1
|
* Fix logcontext resource usage trackingErik Johnston2018-05-221-11/+27
|
* Merge pull request #3252 from matrix-org/erikj/in_flight_requestsErik Johnston2018-05-222-2/+162
|\ | | | | Add in flight request metrics
| * Don't store contextErik Johnston2018-05-221-8/+5
| |
| * Move in_flight_requests_count to be a callback metricErik Johnston2018-05-221-10/+21
| |
| * Add in flight request metricsErik Johnston2018-05-212-2/+154
| | | | | | | | | | This tracks CPU and DB usage while requests are in flight, rather than when we write the response.
* | Merge pull request #3255 from matrix-org/rav/fix_transactionsRichard van der Hoff2018-05-212-21/+96
|\ \ | | | | | | Stop the transaction cache caching failures
| * | Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-212-25/+42
| | | | | | | | | | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL
| * | Stop the transaction cache caching failuresRichard van der Hoff2018-05-212-9/+67
| | | | | | | | | | | | | | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache.
* | | Merge pull request #3251 from matrix-org/cohort_analyticsNeil Johnson2018-05-211-1/+5
|\ \ \ | |/ / |/| | Tighter filtering for user_daily_visits
| * | Tighter filtering for user_daily_visitsNeil Johnson2018-05-181-1/+5
| |/
* | Merge pull request #3239 from ptman/developMichael Kaye2018-05-211-2/+2
|\ \ | |/ |/| Add lxml to docker image for web previews
| * Add lxml to docker image for web previewsPaul Tötterman2018-05-181-2/+2
| | | | | | | | Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
* | Merge pull request #3241 from matrix-org/fix_user_visits_insertionNeil Johnson2018-05-181-1/+1
|\ \ | |/ |/| fix psql compatability bug
| * fix psql compatability bugNeil Johnson2018-05-181-1/+1
|/
* Merge branch 'master' into developNeil Johnson2018-05-185-19/+45
|\
| * Merge tag 'v0.29.1'Neil Johnson2018-05-184-10/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in synapse v0.29.1 (2018-05-17) ========================================== Changes: * Update docker documentation (PR #3222) Changes in synapse v0.29.0 (2018-05-16) =========================================== Not changes since v0.29.0-rc1 Changes in synapse v0.29.0-rc1 (2018-05-14) =========================================== Notable changes, a docker file for running Synapse (Thanks to @kaiyou!) and a closed spec bug in the Client Server API. Additionally further prep for Python 3 migration. Potentially breaking change: * Make Client-Server API return 401 for invalid token (PR #3161). This changes the Client-server spec to return a 401 error code instead of 403 when the access token is unrecognised. This is the behaviour required by the specification, but some clients may be relying on the old, incorrect behaviour. Thanks to @NotAFile for fixing this. Features: * Add a Dockerfile for synapse (PR #2846) Thanks to @kaiyou! Changes - General: * nuke-room-from-db.sh: added postgresql option and help (PR #2337) Thanks to @rubo77! * Part user from rooms on account deactivate (PR #3201) * Make 'unexpected logging context' into warnings (PR #3007) * Set Server header in SynapseRequest (PR #3208) * remove duplicates from groups tables (PR #3129) * Improve exception handling for background processes (PR #3138) * Add missing consumeErrors to improve exception handling (PR #3139) * reraise exceptions more carefully (PR #3142) * Remove redundant call to preserve_fn (PR #3143) * Trap exceptions thrown within run_in_background (PR #3144) Changes - Refactors: * Refactor /context to reuse pagination storage functions (PR #3193) * Refactor recent events func to use pagination func (PR #3195) * Refactor pagination DB API to return concrete type (PR #3196) * Refactor get_recent_events_for_room return type (PR #3198) * Refactor sync APIs to reuse pagination API (PR #3199) * Remove unused code path from member change DB func (PR #3200) * Refactor request handling wrappers (PR #3203) * transaction_id, destination defined twice (PR #3209) Thanks to @damir-manapov! * Refactor event storage to prepare for changes in state calculations (PR #3141) * Set Server header in SynapseRequest (PR #3208) * Use deferred.addTimeout instead of time_bound_deferred (PR #3127, #3178) * Use run_in_background in preference to preserve_fn (PR #3140) Changes - Python 3 migration: * Construct HMAC as bytes on py3 (PR #3156) Thanks to @NotAFile! * run config tests on py3 (PR #3159) Thanks to @NotAFile! * Open certificate files as bytes (PR #3084) Thanks to @NotAFile! * Open config file in non-bytes mode (PR #3085) Thanks to @NotAFile! * Make event properties raise AttributeError instead (PR #3102) Thanks to @NotAFile! * Use six.moves.urlparse (PR #3108) Thanks to @NotAFile! * Add py3 tests to tox with folders that work (PR #3145) Thanks to @NotAFile! * Don't yield in list comprehensions (PR #3150) Thanks to @NotAFile! * Move more xrange to six (PR #3151) Thanks to @NotAFile! * make imports local (PR #3152) Thanks to @NotAFile! * move httplib import to six (PR #3153) Thanks to @NotAFile! * Replace stringIO imports with six (PR #3154, #3168) Thanks to @NotAFile! * more bytes strings (PR #3155) Thanks to @NotAFile! Bug Fixes: * synapse fails to start under Twisted >= 18.4 (PR #3157) * Fix a class of logcontext leaks (PR #3170) * Fix a couple of logcontext leaks in unit tests (PR #3172) * Fix logcontext leak in media repo (PR #3174) * Escape label values in prometheus metrics (PR #3175, #3186) * Fix 'Unhandled Error' logs with Twisted 18.4 (PR #3182) Thanks to @Half-Shot! * Fix logcontext leaks in rate limiter (PR #3183) * notifications: Convert next_token to string according to the spec (PR #3190) Thanks to @mujx! * nuke-room-from-db.sh: fix deletion from search table (PR #3194) Thanks to @rubo77! * add guard for None on purge_history api (PR #3160) Thanks to @krombel!
| | * Merge branch 'release-v0.29.0' of https://github.com/matrix-org/synapse into ↵ v0.29.1 github/release-v0.29.0 release-v0.29.0Neil Johnson2018-05-182-2/+8
| | |\ | | | | | | | | | | | | release-v0.29.0
| | | * bump version, change logNeil Johnson2018-05-172-2/+8
| | | |
| | * | light grammar changesNeil Johnson2018-05-171-4/+4
| | | |
| | * | Note that secrets need to be retained.Michael Kaye2018-05-171-2/+7
| | | |
| | * | Document macaroon env var correctlyMichael Kaye2018-05-171-2/+2
| | | |
| | * | Reference synapse docker image and docker-composeMichael Kaye2018-05-171-2/+3
| | |/
| * | Merge pull request #1756 from rubo77/patch-4Richard van der Hoff2018-05-171-9/+23
| |\ \ | | |/ | |/| Add instructions how to setup the postgres user and clarify the final step
| | * postgres.rst: Add instructions how to setup the postgres user and clarify ↵rubo772018-05-171-9/+23
| |/ | | | | | | the final step
* | Merge pull request #3232 from matrix-org/rav/server_notices_roomRichard van der Hoff2018-05-1810-7/+309
|\ \ | | | | | | Infrastructure for a server notices room
| * | Better docstringsRichard van der Hoff2018-05-181-0/+16
| | |
| * | Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-183-0/+20
| | |
| * | Replace inline docstrings with "Attributes" in class docstringRichard van der Hoff2018-05-181-23/+15
| | |
| * | fix missing yield for server_notices_roomRichard van der Hoff2018-05-171-3/+4
| | |
| * | Infrastructure for a server notices roomRichard van der Hoff2018-05-179-7/+280
| | | | | | | | | | | | | | | | | | | | | Server Notices use a special room which the user can't dismiss. They are created on demand when some other bit of the code calls send_notice. (This doesn't actually do much yet becuse we don't call send_notice anywhere)
* | | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferredRichard van der Hoff2018-05-181-7/+11
|\ \ \ | | | | | | | | Fix error in handling receipts
| * | | Fix error in handling receiptsRichard van der Hoff2018-05-181-7/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | Fixes an error which has been happening ever since #2158 (v0.21.0-rc1): > TypeError: argument of type 'ObservableDeferred' is not iterable fixes #3234
* | | Merge pull request #3233 from matrix-org/rav/remove_dead_codeRichard van der Hoff2018-05-181-55/+0
|\ \ \ | | | | | | | | Remove unused `update_external_syncs`
| * | | Remove unused `update_external_syncs`Richard van der Hoff2018-05-171-55/+0
| |/ / | | | | | | | | | This method isn't used anywhere. Burninate it.
* | | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-183-37/+69
|\ \ \ | |/ / |/| | Make purge_history operate on tokens
| * | Clarify commentErik Johnston2018-05-161-1/+2
| | |
| * | CommentsErik Johnston2018-05-161-0/+8
| | |
| * | Move and rename variableErik Johnston2018-05-161-3/+3
| | |
| * | Make purge_history operate on tokensErik Johnston2018-05-153-21/+25
| | | | | | | | | | | | As we're soon going to change how topological_ordering works
| * | Use events_to_purge table rather than tokenErik Johnston2018-05-151-15/+34
| | |
* | | Merge pull request #3225 from matrix-org/rav/move_creation_handlerRichard van der Hoff2018-05-176-11/+19
|\ \ \ | | | | | | | | Move RoomCreationHandler out of synapse.handlers.Handlers
| * | | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-176-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Handlers is deprecated nowadays, so let's move this out before I add a new dependency on it. Also fix the docstrings on create_room.
* | | | Merge pull request #3212 from matrix-org/erikj/epa_streamErik Johnston2018-05-173-40/+18
|\ \ \ \ | | | | | | | | | | Use stream rather depth ordering for push actions
| * | | | Use stream rather depth ordering for push actionsErik Johnston2018-05-113-40/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies things as it is, but will also allow us to change the way we traverse topologically without having to update the way push actions work.
* | | | | Merge branch 'master' into developNeil Johnson2018-05-162-3/+71
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | bump version and changelog for 0.29.0 v0.29.0Neil Johnson2018-05-162-1/+5
| | | |
| * | | further musical chairsNeil Johnson2018-05-141-2/+3
| | | |
| * | | rearrange and collect related PRsNeil Johnson2018-05-141-26/+27
| | | |
| * | | v0.29.0-rc1: bump version and change log v0.29.0-rc1Neil Johnson2018-05-142-3/+65
| | |/ | |/|
* | | Merge pull request #3163 from matrix-org/cohort_analyticsNeil Johnson2018-05-167-5/+122
|\ \ \ | | | | | | | | user visit data
| * | | remove empty lineNeil Johnson2018-05-161-1/+0
| | | |
| * | | remove unused method recurring_user_daily_visit_statsNeil Johnson2018-05-161-3/+0
| | | |
| * | | style and further contraining queryNeil Johnson2018-05-161-8/+12
| | | |
| * | | pep8Neil Johnson2018-05-151-1/+0
| | | |
| * | | Limit query load of generate_user_daily_visitsNeil Johnson2018-05-152-27/+54
| | | | | | | | | | | | | | | | The aim is to keep track of when it was last called and only query from that point in time
| * | | instead of inserting user daily visit data at the end of the day, instead ↵Neil Johnson2018-05-142-43/+30
| | | | | | | | | | | | | | | | insert incrementally through the day
| * | | Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-05-14120-1181/+2386
| |\ \ \ | | | | | | | | | | | | | | | cohort_analytics
| * | | | remove user agent from data model, will just join on user_ipsNeil Johnson2018-05-011-12/+11
| | | | |
| * | | | add inidexes based on usageNeil Johnson2018-05-011-6/+2
| | | | |
| * | | | 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 pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-1614-5/+446
|\ \ \ \ \ | |_|_|/ / |/| | | | ConsentResource to gather policy consent from users
| * | | | ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-1514-5/+446
| | | | | | | | | | | | | | | | | | | | | | | | | Hopefully there are enough comments and docs in this that it makes sense on its own.
* | | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-143-2/+143
|\ \ \ \ \ | |_|_|/ / |/| | | | Part user from rooms on account deactivate
| * | | | Catch failure to part user from roomDavid Baker2018-05-101-7/+13
| | | | |
| * | | | Many docstringsDavid Baker2018-05-102-0/+36
| | | | |
| * | | | Oops, don't call function passed to run_in_backgroundDavid Baker2018-05-101-1/+1
| | | | |
| * | | | Prefix internal functionsDavid Baker2018-05-091-7/+7
| | | | |
| * | | | Add the schema fileDavid Baker2018-05-091-0/+25
| | | | |
| * | | | Indent failDavid Baker2018-05-091-1/+1
| | | | |
| * | | | Part deactivated users in the backgroundDavid Baker2018-05-092-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | One room at a time so we don't take out the whole server with leave events, and restart at server restart.
| * | | | Part user from rooms on account deactivateDavid Baker2018-05-081-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements this very crudely: this probably isn't viable because parting a user from all their rooms could take a long time, and if the HS gets restarted in that time the process will be aborted.
* | | | | Merge pull request #2846 from kaiyou/feat-dockerfileMichael Kaye2018-05-1110-0/+541
|\ \ \ \ \ | | | | | | | | | | | | Add a Dockerfile for synapse
| * | | | | Add Docker packaging in the author listkaiyou2018-05-041-0/+3
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-05-0269-496/+1028
| |\ \ \ \ \
| * | | | | | Make the logging level configurablekaiyou2018-05-012-3/+4
| | | | | | |
| * | | | | | Fix the documentation about 'POSTGRES_DB'kaiyou2018-05-011-1/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-04-1451-279/+965
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-04-08179-4356/+8696
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feat-dockerfilekaiyou2018-03-1727-39/+46
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Disable logging to file and rely on the console when using Dockerkaiyou2018-02-101-8/+1
| | | | | | | | | |
| * | | | | | | | | Explicitely provide the postgres password to synapse in the Compose examplekaiyou2018-02-101-0/+1
| | | | | | | | | |
| * | | | | | | | | Remove an accidentally committed test configurationkaiyou2018-02-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Generate macaroon and registration secrets, then store the results to the ↵kaiyou2018-02-102-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data dir
| * | | | | | | | | Fix the path to the log config filekaiyou2018-02-092-2/+2
| | | | | | | | | |
| * | | | | | | | | Make SYNAPSE_MACAROON_SECRET_KEY a mandatory optionkaiyou2018-02-092-3/+4
| | | | | | | | | |
| * | | | | | | | | Specify the Docker registry for the postgres imagekaiyou2018-02-081-1/+1
| | | | | | | | | |
| * | | | | | | | | Specify the Docker registry in the build tagkaiyou2018-02-081-1/+1
| | | | | | | | | |
| * | | | | | | | | Make it clear that the image has two modes of operationkaiyou2018-02-081-5/+24
| | | | | | | | | |
| * | | | | | | | | Update to Alpine 3.7 and switch to libresslkaiyou2018-02-081-2/+2
| | | | | | | | | |
| * | | | | | | | | Enable email server configuration from environment variableskaiyou2018-02-082-16/+24
| | | | | | | | | |
| * | | | | | | | | Honor the SYNAPSE_REPORT_STATS parameter in the Docker imagekaiyou2018-02-081-0/+5
| | | | | | | | | |
| * | | | | | | | | Disable the Web client in the Docker imagekaiyou2018-02-082-4/+3
| | | | | | | | | |
| * | | | | | | | | Use 'synapse' as a default postgres user in Docker exampleskaiyou2018-02-082-3/+3
| | | | | | | | | |
| * | | | | | | | | Refactor the start script to better handle mandatory parameterskaiyou2018-02-083-24/+35
| | | | | | | | | |
| * | | | | | | | | Rename the permissions variable to avoid confusionkaiyou2018-02-081-3/+3
| | | | | | | | | |
| * | | | | | | | | Add some documentation about high performance storagekaiyou2018-02-081-2/+7
| | | | | | | | | |
| * | | | | | | | | Make it clear that two modes are avaiable in the documentation, improve the ↵kaiyou2018-02-082-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compose file
| * | | | | | | | | Support loading application service files from /data/appservices/kaiyou2018-02-053-2/+18
| | | | | | | | | |
| * | | | | | | | | Add the non-tls port to the expose listkaiyou2018-02-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Only generate configuration files when necessarykaiyou2018-02-051-5/+7
| | | | | | | | | |
| * | | | | | | | | Do not copy documentation files to the Docker root folderkaiyou2018-02-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Point to the 'latest' tag in the Docker documentationkaiyou2018-02-052-2/+2
| | | | | | | | | |
| * | | | | | | | | Fix a typo in the Docker READMEkaiyou2018-02-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Document the cache factor environment variable for Dockerkaiyou2018-02-051-0/+1
| | | | | | | | | |
| * | | | | | | | | Add dynamic TURN configuration in the Docker imagekaiyou2018-02-052-2/+14
| | | | | | | | | |
| * | | | | | | | | Add dynamic recaptcha configuration in the Docker imagekaiyou2018-02-052-0/+11
| | | | | | | | | |
| * | | | | | | | | Remove docker related files from the python manifestkaiyou2018-02-051-0/+1
| | | | | | | | | |
| * | | | | | | | | Run the server as an unprivileged userkaiyou2018-02-042-5/+8
| | | | | | | | | |
| * | | | | | | | | Fix multiple typoskaiyou2018-02-043-10/+17
| | | | | | | | | |
| * | | | | | | | | Add the build cache/ folder to gitignorekaiyou2018-02-041-0/+1
| | | | | | | | | |
| * | | | | | | | | Update sumperdump Docker readme to match this image propertieskaiyou2018-02-041-38/+64
| | | | | | | | | |
| * | | | | | | | | Remove etc/service files from rob's branchkaiyou2018-02-043-131/+0
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfilekaiyou2018-02-044-0/+201
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | docker: s/matrix-org/matrixdotorg/gRobert Swain2017-09-292-5/+5
| | | | | | | | | | |
| | * | | | | | | | | docker: Initial Dockerfile and docker-compose.yamlRobert Swain2017-09-285-0/+259
| | | | | | | | | | |
| * | | | | | | | | | Reuse environment variables of the postgres containerkaiyou2018-02-042-9/+14
| | | | | | | | | | |
| * | | | | | | | | | Provide an example docker compose filekaiyou2018-02-042-0/+34
| | | | | | | | | | |
| * | | | | | | | | | Install the postgres dependencieskaiyou2018-02-041-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Support an external postgresql config in the Docker imagekaiyou2018-02-041-2/+11
| | | | | | | | | | |
| * | | | | | | | | | Generate shared secrets if not defined in the environmentkaiyou2018-02-041-4/+11
| | | | | | | | | | |
| * | | | | | | | | | Generate any missing keys before starting synapsekaiyou2018-02-041-12/+13
| | | | | | | | | | |
| * | | | | | | | | | Allow for a wheel cache and include missing files in the buildkaiyou2018-02-043-6/+13
| | | | | | | | | | |
| * | | | | | | | | | Add template config files for the Docker imagekaiyou2018-02-032-0/+217
| | | | | | | | | | |
| * | | | | | | | | | Initial commit including a Dockerfile for synapsekaiyou2018-02-032-0/+45
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3208 from matrix-org/rav/more_refactor_request_handlerRichard van der Hoff2018-05-1123-27/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set Server header in SynapseRequest
| * | | | | | | | | | | Set Server header in SynapseRequestRichard van der Hoff2018-05-1023-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (instead of everywhere that writes a response. Or rather, the subset of places which write responses where we haven't forgotten it). This also means that we don't have to have the mysterious version_string attribute in anything with a request handler. Unfortunately it does mean that we have to pass the version string wherever we instantiate a SynapseSite, which has been c&ped 150 times, but that is code that ought to be cleaned up anyway really.
* | | | | | | | | | | | Merge pull request #3209 from damir-manapov/masterRichard van der Hoff2018-05-111-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | transaction_id, destination defined twice
| * | | | | | | | | | | transaction_id, destination twiceDamir Manapov2018-05-101-2/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-05-110-0/+0
|\| | | | | | | | | | | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | missing word :|Matthew Hodgson2018-05-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'release-v0.28.1'Matthew Hodgson2018-05-011-3/+3
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #3203 from matrix-org/rav/refactor_request_handlerRichard van der Hoff2018-05-109-251/+339
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Refactor request handling wrappers
| * | | | | | | | | | Remove redundant request_handler decoratorRichard van der Hoff2018-05-107-38/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needless complexity; we might as well use the wrapper directly. Also rename wrap_request_handler->wrap_json_request_handler.
| * | | | | | | | | | Factor wrap_request_handler_with_logging out of wrap_request_handlerRichard van der Hoff2018-05-101-54/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so that it can be used on non-JSON endpoints
| * | | | | | | | | | Remove include_metrics paramRichard van der Hoff2018-05-101-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metrics are now available via the request, so this is redundant and can go away at last.
| * | | | | | | | | | Move outgoing_responses_counter handling to RequestMetricsRichard van der Hoff2018-05-102-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's much neater there.
| * | | | | | | | | | Bump requests_counter in wrapped_request_handlerRichard van der Hoff2018-05-101-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less magic
| * | | | | | | | | | Move RequestMetrics handling into SynapseRequest.processing()Richard van der Hoff2018-05-102-24/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fits quite nicely here, and opens the path to getting rid of the "include_metrics" mess.
| * | | | | | | | | | Make RequestMetrics take a raw time rather than a clockRichard van der Hoff2018-05-102-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... which is going to make it easier to move around.
| * | | | | | | | | | Move request_id management into SynapseRequestRichard van der Hoff2018-05-102-15/+25
| | | | | | | | | | |
| * | | | | | | | | | Move RequestsMetrics to its own fileRichard van der Hoff2018-05-092-124/+151
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful in its own right, because server.py is full of stuff; but more importantly, I want to do some refactoring that will cause a circular reference as it is.
* | | | | | | | | | Merge pull request #3199 from matrix-org/erikj/pagination_syncErik Johnston2018-05-092-45/+54
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refactor sync APIs to reuse pagination API
| * | | | | | | | | | Add comment to sync as to why code path is splitErik Johnston2018-05-091-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Refactor sync APIs to reuse pagination APIErik Johnston2018-05-092-44/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sync API often returns events in a topological rather than stream ordering, e.g. when the user joined the room or on initial sync. When this happens we can reuse existing pagination storage functions.
| * | | | | | | | | | Don't unnecessarily require token to be stream tokenErik Johnston2018-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows calling the `get_recent_event_ids_for_room` function in more situations.
* | | | | | | | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_paginationErik Johnston2018-05-093-8/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor get_recent_events_for_room return type
| * | | | | | | | | | | Fix returned token is no longer a tupleErik Johnston2018-05-091-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix up commentErik Johnston2018-05-091-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-05-094-10/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | erikj/fixup_return_pagination
| * | | | | | | | | | | Refactor get_recent_events_for_room return typeErik Johnston2018-05-093-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to return a tuple of tokens when the last token is always the token passed as an argument. Changing it makes it consistent with other storage APIs
* | | | | | | | | | | | Merge pull request #3200 from matrix-org/erikj/remove_membership_changeErik Johnston2018-05-091-24/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Remove unused code path from member change DB func
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-05-094-10/+22
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | erikj/remove_membership_change
* | | | | | | | | | | | Merge pull request #3196 from matrix-org/erikj/pagination_returnErik Johnston2018-05-091-28/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor pagination DB API to return concrete type
| * | | | | | | | | | | | Update commentsErik Johnston2018-05-091-5/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3195 from matrix-org/erikj/pagination_refactorErik Johnston2018-05-091-51/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor recent events func to use pagination func
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3194 from rubo77/fix-nukeRichard van der Hoff2018-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nuke-room-from-db.sh: fix deletion from search table
| * | | | | | | | | | | | | nuke-room-from-db.sh: nuke from table event_search toorubo772018-05-091-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Dont nuke non-existing table event_search_contentrubo772018-05-091-1/+0
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3193 from matrix-org/erikj/pagination_refactorErik Johnston2018-05-091-110/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor /context to reuse pagination storage functions
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2337 from rubo77/patch-5Richard van der Hoff2018-05-091-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | nuke-room-from-db.sh: added postgresql option and help
| * | | | | | | | | | | | | nuke-room-from-db.sh: added postgresql option and helprubo772018-05-091-1/+11
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3190 from mujx/notif-token-fixRichard van der Hoff2018-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications: Convert next_token to string according to the spec
| * | | | | | | | | | | | | notifications: Convert next_token to string according to the specKonstantinos Sideris2018-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the parameter is serialized as an integer. Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
* | | | | | | | | | | | | | Merge pull request #3186 from matrix-org/erikj/fix_int_values_metricsErik Johnston2018-05-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Fix metrics that have integer value labels
| * | | | | | | | | | | | | Note that label values can be anythingErik Johnston2018-05-031-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix metrics that have integer value labelsErik Johnston2018-05-031-1/+1
|/ / / / / / / / / / / / /
| | | | * / / / / / / / / Remove unused code path from member change DB funcErik Johnston2018-05-091-24/+10
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function is never called without a from_key, so we can remove all the handling for that scenario.
| | | * / / / / / / / / Refactor pagination DB API to return concrete typeErik Johnston2018-05-091-28/+48
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to document what is being returned by the storage functions and what some functions expect as arguments.
| | * | | | | | | | | Remove unused from_token paramErik Johnston2018-05-091-7/+4
| | | | | | | | | | |
| | * | | | | | | | | Refactor recent events func to use pagination funcErik Johnston2018-05-091-48/+27
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also removes a cache that is unlikely to ever get hit.
| * | | | | | | | | Fix up comments and make function privateErik Johnston2018-05-091-7/+7
| | | | | | | | | |
| * | | | | | | | | Reuse existing pagination code for context APIErik Johnston2018-05-081-75/+15
| | | | | | | | | |
| * | | | | | | | | Parse tokens before calling DB functionErik Johnston2018-05-081-14/+18
| | | | | | | | | |
| * | | | | | | | | Only fetch required fields from databaseErik Johnston2018-05-081-1/+2
| | | | | | | | | |
| * | | | | | | | | Split paginate_room_events storage functionErik Johnston2018-05-081-28/+72
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_failRichard van der Hoff2018-05-031-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make 'unexpected logging context' into warnings
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_failRichard van der Hoff2018-05-03173-1459/+3290
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaksRichard van der Hoff2018-05-031-3/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix logcontext leaks in rate limiter
| * | | | | | | | | | Fix logcontext leaks in rate limiterRichard van der Hoff2018-05-031-3/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdownRichard van der Hoff2018-05-031-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 'Unhandled Error' logs with Twisted 18.4
| * | | | | | | | | | | Don't abortConnection() if the transport connection has already closed.Will Hunt2018-05-031-3/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3178 from matrix-org/rav/fix_request_timeoutsRichard van der Hoff2018-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | fix http request timeout code
| * | | | | | | | | | | add missing param to cancelled_to_request_timed_out_errorRichard van der Hoff2018-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets two arguments, not one.
* | | | | | | | | | | | Fix changes warningRichard van der Hoff2018-05-031-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Warn of potential client incompatibility from #3161Richard van der Hoff2018-05-031-0/+15
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3141 from matrix-org/erikj/fixup_stateErik Johnston2018-05-031-37/+67
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor event storage to prepare for changes in state calculations
| * | | | | | | | | | | | Fix up grammarErik Johnston2018-05-031-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactor event storage to not require stateErik Johnston2018-04-271-37/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for using contexts that may or may not have the current_state_ids set. This will allow us to avoid unnecessarily pulling out state for an event on the master process when using workers. We also add a check to see if the state groups of the old extremities are the same as the new ones.
* | | | | | | | | | | | | Merge pull request #3161 from NotAFile/remove-v1authRichard van der Hoff2018-05-037-25/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Client-Server API return 403 for invalid token
| * | | | | | | | | | | | | Burminate v1authAdrian Tschira2018-04-307-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | Merge pull request #3175 from matrix-org/erikj/escape_metric_valuesErik Johnston2018-05-032-3/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Escape label values in prometheus metrics
| * | | | | | | | | | | | | Make _escape_character take MatchObjectErik Johnston2018-05-021-2/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Escape label values in prometheus metricsErik Johnston2018-05-022-3/+40
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3170 from matrix-org/rav/more_logcontext_leaksRichard van der Hoff2018-05-022-33/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a class of logcontext leaks
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/more_logcontext_leaksRichard van der Hoff2018-05-026-6/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove spurious unittest.DEBUGRichard van der Hoff2018-05-021-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix a class of logcontext leaksRichard van der Hoff2018-05-022-33/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, it turns out that if you have a first `Deferred` `D1`, you can add a callback which returns another `Deferred` `D2`, and `D2` must then complete before any further callbacks on `D1` will execute (and later callbacks on `D1` get the *result* of `D2` rather than `D2` itself). So, `D1` might have `called=True` (as in, it has started running its callbacks), but any new callbacks added to `D1` won't get run until `D2` completes - so if you `yield D1` in an `inlineCallbacks` function, your `yield` will 'block'. In conclusion: some of our assumptions in `logcontext` were invalid. We need to make sure that we don't optimise out the logcontext juggling when this situation happens. Fortunately, it is easy to detect by checking `D1.paused`.
* | | | | | | | | | | | | | | | Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaksRichard van der Hoff2018-05-022-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fix logcontext leak in media repo
| * | | | | | | | | | | | | | | Fix logcontext leak in media repoRichard van der Hoff2018-05-022-1/+4
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make FileResponder.write_to_consumer uphold the logcontext contract
* | | | | | | | | | | | | | | Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaksRichard van der Hoff2018-05-022-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Fix a couple of logcontext leaks in unit tests
| * | | | | | | | | | | | | | Fix a couple of logcontext leaks in unit testsRichard van der Hoff2018-05-022-3/+9
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... which were making other, innocent, tests, fail. Plus remove a spurious unittest.DEBUG which was making the output noisy.
* | | | | | | | | | | | | | Merge pull request #3168 from matrix-org/rav/fix_logformatterRichard van der Hoff2018-05-022-1/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect reference to StringIO
| * | | | | | | | | | | | | | Fix incorrect reference to StringIORichard van der Hoff2018-05-022-1/+39
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in 4f2f5171
* | | | | | | | | | | | | | missing word :|Matthew Hodgson2018-05-011-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'release-v0.28.1' into developMatthew Hodgson2018-05-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fix markdownMatthew Hodgson2018-05-011-3/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into developNeil Johnson2018-05-012-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | fix conflict in changelog from previous releaseNeil Johnson2018-05-016-7/+68
| |\| | | | | | | | | | |
| | * | | | | | | | | | | changelog for 0.28.1 v0.28.1Matthew Hodgson2018-05-011-2/+23
| | | | | | | | | | | | |
| | * | | | | | | | | | | Update __init__.pyNeil Johnson2018-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bump version
* | | | | | | | | | | | | Merge branch 'release-v0.28.1' into developRichard van der Hoff2018-05-013-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge commit '33f469b' into release-v0.28.1Richard van der Hoff2018-05-013-4/+26
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Apply some limits to depth to counter abuseRichard van der Hoff2018-05-013-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When creating a new event, cap its depth to 2^63 - 1 * When receiving events, reject any without a sensible depth As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI
| * | | | | | | | | | | | Miscellaneous fixes to python_dependenciesRichard van der Hoff2018-05-011-1/+19
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)
* | | | | | | | | | | | Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)Will Hunt2018-04-302-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #3135 Signed-off-by: Will Hunt will@half-shot.uk
* | | | | | | | | | | | Merge pull request #3160 from krombel/fix_3076Richard van der Hoff2018-04-301-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | add guard for None on purge_history api
| * | | | | | | | | | | | add guard for None on purge_history apiKrombel2018-04-301-1/+14
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3129 from matrix-org/matthew/fix_group_dupsMatthew Hodgson2018-04-301-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | remove duplicates from groups tables
| * | | | | | | | | | | | fix missing importMatthew Hodgson2018-04-281-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | pep8Matthew Hodgson2018-04-281-3/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | make it work with sqliteMatthew Hodgson2018-04-282-34/+54
| | | | | | | | | | | | |
| * | | | | | | | | | | | remove duplicates from groups tablesMatthew Hodgson2018-04-251-0/+34
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and rename inconsistently named indexes. Based on https://github.com/matrix-org/synapse/pull/3128 - thanks @vurpo\!
* | | | | | | | | | | | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fnRichard van der Hoff2018-04-301-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant call to preserve_fn
| * | | | | | | | | | | | Remove redundant call to preserve_fnRichard van der Hoff2018-04-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submit_event_for_as doesn't return a deferred anyway, so this is pointless.
* | | | | | | | | | | | | Merge pull request #3144 from ↵Richard van der Hoff2018-04-301-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/run_in_background_exception_handling Trap exceptions thrown within run_in_background
| * | | | | | | | | | | | | Trap exceptions thrown within run_in_backgroundRichard van der Hoff2018-04-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn any exceptions that get thrown synchronously within run_in_background into Failures instead.
* | | | | | | | | | | | | | Merge pull request #3159 from NotAFile/py3-tests-configRichard van der Hoff2018-04-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run config tests on py3
| * | | | | | | | | | | | | | run config tests on py3Adrian Tschira2018-04-301-1/+2
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | Merge pull request #3102 from NotAFile/py3-attributeerrorRichard van der Hoff2018-04-301-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make event properties raise AttributeError instead
| * | | | | | | | | | | | | | add comment explaining attributeerrorAdrian Tschira2018-04-301-0/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make event properties raise AttributeError insteadAdrian Tschira2018-04-151-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They raised KeyError before. I'm changing this because the code uses hasattr() to check for the presence of a key. This worked accidentally before, because hasattr() silences all exceptions in python 2. However, in python3, this isn't the case anymore. I had a look around to see if anything depended on this raising a KeyError and I couldn't find anything. Of course, I could have simply missed it. Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | | Merge pull request #3152 from NotAFile/py3-local-importsRichard van der Hoff2018-04-304-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make imports local
| * | | | | | | | | | | | | | | make imports localAdrian Tschira2018-04-284-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | | | Merge pull request #3153 from NotAFile/py3-httplibRichard van der Hoff2018-04-301-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move httplib import to six
| * | | | | | | | | | | | | | | | move httplib import to sixAdrian Tschira2018-04-281-3/+3
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3151 from NotAFile/py3-xrange-1Richard van der Hoff2018-04-309-11/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move more xrange to six
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-3042-121/+161
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Move more xrange to sixAdrian Tschira2018-04-289-11/+28
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus a bonus next() Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | | | | Merge branch 'rav/test_36' into developRichard van der Hoff2018-04-301-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | add py36 to build matrixRichard van der Hoff2018-04-301-5/+13
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #3150 from NotAFile/py3-listcomp-yieldRichard van der Hoff2018-04-301-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Don't yield in list comprehensions
| * | | | | | | | | | | | | | | | | Don't yield in list comprehensionsAdrian Tschira2018-04-281-5/+9
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've tried to grep for more of this with no success. Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | | | | Merge pull request #3085 from NotAFile/py3-config-text-modeRichard van der Hoff2018-04-302-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open config file in non-bytes mode
| * | | | | | | | | | | | | | | | | open log_config in text mode tooAdrian Tschira2018-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | | | | | | Open config file in non-bytes modeAdrian Tschira2018-04-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing written into it is encoded, so it makes little sense, but it does break in python3 the way it was before. The variable names were adjusted to be less misleading. Signed-off-by: Adrian Tschira <nota@notafile.com>
* | | | | | | | | | | | | | | | | | Merge pull request #3084 from NotAFile/py3-certs-byte-modeRichard van der Hoff2018-04-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open certificate files as bytes
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 03:07:28 +0000