summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| | * | | | | | | | | | | | | | | | | | Open certificate files as bytesAdrian Tschira2018-04-101-2/+2
| | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's what pyOpenSSL expects on python3 Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | | | | | | | Merge pull request #3154 from NotAFile/py3-stringioRichard van der Hoff2018-04-302-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | Replace stringIO imports with six
| | * | | | | | | | | | | | | | | | | replace stringIO importsAdrian Tschira2018-04-282-3/+3
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #3145 from NotAFile/py3-testsRichard van der Hoff2018-04-301-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Add py3 tests to tox with folders that work
| | * | | | | | | | | | | | | | | | Update tox.iniRichard van der Hoff2018-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add missing comma
| | * | | | | | | | | | | | | | | | Add py3 tests to tox with folders that workAdrian Tschira2018-04-271-1/+9
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's just a few tests, but it will at least prevent a few files from regressing. Also, it makes it easiert to check your code against py36 while writing it. Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | | | | | Merge pull request #3155 from NotAFile/py3-bytes-1Richard van der Hoff2018-04-304-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more bytes strings
| | * | | | | | | | | | | | | | | | more bytes stringsAdrian Tschira2018-04-294-7/+10
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | | | | | Merge pull request #3140 from matrix-org/rav/use_run_in_backgroundRichard van der Hoff2018-04-3022-72/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use run_in_background in preference to preserve_fn
| | * | | | | | | | | | | | | | | | pep8; remove spurious importRichard van der Hoff2018-04-271-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-2728-261/+416
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-2722-71/+97
| | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object.
| * | | | | | | | | | | | | | | | | Merge pull request #3156 from NotAFile/py3-hmac-bytesRichard van der Hoff2018-04-302-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct HMAC as bytes on py3
| | * | | | | | | | | | | | | | | | | Construct HMAC as bytes on py3Adrian Tschira2018-04-292-11/+15
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | | | | | | Merge pull request #3108 from NotAFile/py3-six-urlparseRichard van der Hoff2018-04-308-21/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Use six.moves.urlparse
| | * | | | | | | | | | | | | | | | Use six.moves.urlparseAdrian Tschira2018-04-158-21/+20
| | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com>
| * | | | | | | | | | | | | | | | Merge pull request #3127 from matrix-org/rav/deferred_timeoutRichard van der Hoff2018-04-277-130/+135
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | Use deferred.addTimeout instead of time_bound_deferred
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/deferred_timeoutRichard van der Hoff2018-04-2728-261/+416
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-04-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Update CHANGES.rstNeil Johnson2018-04-271-1/+1
| | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3142 from matrix-org/rav/reraiseRichard van der Hoff2018-04-272-13/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reraise exceptions more carefully
| | * | | | | | | | | | | | | | | reraise exceptions more carefullyRichard van der Hoff2018-04-272-13/+24
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to be careful (under python 2, at least) that when we reraise an exception after doing some error handling, we actually reraise the original exception rather than anything that might have been raised (and handled) during the error handling.
| * | | | | | | | | | | | | | | Update CHANGES.rstNeil Johnson2018-04-271-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3136 from matrix-org/rav/fix_dependenciesRichard van der Hoff2018-04-272-2/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous fixes to python_dependencies
| | * | | | | | | | | | | | | | | also upgrade pip when installingRichard van der Hoff2018-04-271-0/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | jenkins build: make sure we have a recent setuptoolsRichard van der Hoff2018-04-261-1/+12
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Miscellaneous fixes to python_dependenciesRichard van der Hoff2018-04-261-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)
| * | | | | | | | | | | | | | | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptionsRichard van der Hoff2018-04-2720-237/+335
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve exception handling for background processes
| | * | | | | | | | | | | | | | | | Improve exception handling for background processesRichard van der Hoff2018-04-2720-237/+335
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background.
| * | | | | | | | | | | | | | | | Merge pull request #3139 from matrix-org/rav/consume_errorsRichard van der Hoff2018-04-273-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | Add missing consumeErrors to improve exception handling
| | * | | | | | | | | | | | | | | Add missing consumeErrorsRichard van der Hoff2018-04-273-5/+9
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general we want defer.gatherResults to consumeErrors, rather than having exceptions hanging around and getting logged as CRITICAL unhandled errors.
| * | | | | | | | | | | | | | | Merge tag 'v0.28.0'Neil Johnson2018-04-274-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in synapse v0.28.0-rc1 (2018-04-26) =========================================== Bug Fixes: * Fix quarantine media admin API and search reindex (PR #3130) * Fix media admin APIs (PR #3134) Changes in synapse v0.28.0-rc1 (2018-04-24) =========================================== Minor performance improvement to federation sending and bug fixes. (Note: This release does not include state resolutions discussed in matrix live) Features: * Add metrics for event processing lag (PR #3090) * Add metrics for ResponseCache (PR #3092) Changes: * Synapse on PyPy (PR #2760) Thanks to @Valodim! * move handling of auto_join_rooms to RegisterHandler (PR #2996) Thanks to @krombel! * Improve handling of SRV records for federation connections (PR #3016) Thanks to @silkeh! * Document the behaviour of ResponseCache (PR #3059) * Preparation for py3 (PR #3061, #3073, #3074, #3075, #3103, #3104, #3106, #3107, #3109, #3110) Thanks to @NotAFile! * update prometheus dashboard to use new metric names (PR #3069) Thanks to @krombel! * use python3-compatible prints (PR #3074) Thanks to @NotAFile! * Send federation events concurrently (PR #3078) * Limit concurrent event sends for a room (PR #3079) * Improve R30 stat definition (PR #3086) * Send events to ASes concurrently (PR #3088) * Refactor ResponseCache usage (PR #3093) * Clarify that SRV may not point to a CNAME (PR #3100) Thanks to @silkeh! * Use str(e) instead of e.message (PR #3103) Thanks to @NotAFile! * Use six.itervalues in some places (PR #3106) Thanks to @NotAFile! * Refactor store.have_events (PR #3117) Bug Fixes: * Return 401 for invalid access_token on logout (PR #2938) Thanks to @dklug! * Return a 404 rather than a 500 on rejoining empty rooms (PR #3080) * fix federation_domain_whitelist (PR #3099) * Avoid creating events with huge numbers of prev_events (PR #3113) * Reject events which have lots of prev_events (PR #3118)
| | * | | | | | | | | | | | | | update changelog and bump version to 0.28.0 v0.28.0 github/release-v0.28.0-rc1 release-v0.28.0-rc1Neil Johnson2018-04-262-1/+10
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵Neil Johnson2018-04-262-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-v0.28.0-rc1
| | * | | | | | | | | | | | | | Update CHANGES.rstNeil Johnson2018-04-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix formatting on line break
| * | | | | | | | | | | | | | | Update CHANGES.rstNeil Johnson2018-04-241-1/+2
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rephrase v0.28.0-rc1 summary
| | | | * | | | | | | | | | | Merge branch 'develop' into rav/deferred_timeoutRichard van der Hoff2018-04-2711-21/+148
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_apiErik Johnston2018-04-261-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix media admin APIs
| | | * | | | | | | | | | | | | Fix media admin APIsErik Johnston2018-04-261-2/+2
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge pull request #3130 from matrix-org/erikj/fix_quarantine_roomErik Johnston2018-04-252-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | Fix quarantine media admin API
| | | * | | | | | | | | | | | Also fix reindexing of searchErik Johnston2018-04-251-1/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix quarantine media admin APIErik Johnston2018-04-251-1/+1
| | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | Backport deferred.addTimeoutRichard van der Hoff2018-04-275-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twisted 16.0 doesn't have addTimeout, so let's backport it.
| | | | * | | | | | | | | | Use deferred.addTimeout instead of time_bound_deferredRichard van der Hoff2018-04-236-130/+59
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't feel like a wheel we need to reinvent.
| | | | | | | * | | | | | Make 'unexpected logging context' into warningsRichard van der Hoff2018-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think we've now fixed enough of these that the rest can be logged at warning.
* | | | | | | | | | | | | 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 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-30 20:20:26 +0000