summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix storage provider bug introduced when renamed to store_localErik Johnston2018-01-181-1/+1
|
* Merge pull request #2812 from matrix-org/erikj/media_storage_provider_configErik Johnston2018-01-183-33/+101
|\ | | | | Make storage providers configurable
| * Fix passing wrong config to provider constructorErik Johnston2018-01-181-1/+1
| |
| * Remove duplicate directory testErik Johnston2018-01-181-4/+0
| |
| * Missing staticmethodErik Johnston2018-01-181-0/+1
| |
| * Fixup commentsErik Johnston2018-01-182-3/+7
| |
| * Make storage providers more configurableErik Johnston2018-01-183-31/+98
| |
* | Merge pull request #2804 from matrix-org/erikj/file_consumerErik Johnston2018-01-182-0/+315
|\ \ | | | | | | Add decent impl of a FileConsumer
| * | Do logcontexts correctlyErik Johnston2018-01-181-2/+2
| | |
| * | Move test stuff to testsErik Johnston2018-01-182-33/+47
| | |
| * | Make all fields privateErik Johnston2018-01-181-31/+31
| | |
| * | Ensure we registerProducer isn't called twiceErik Johnston2018-01-181-0/+3
| | |
| * | Fix _notify_empty typoErik Johnston2018-01-181-1/+1
| | |
| * | Move definition of paused_producer to __init__Erik Johnston2018-01-181-2/+4
| | |
| * | Fix commentsErik Johnston2018-01-181-3/+3
| | |
| * | Add decent impl of a FileConsumerErik Johnston2018-01-172-0/+296
| |/ | | | | | | | | | | | | | | | | | | Twisted core doesn't have a general purpose one, so we need to write one ourselves. Features: - All writing happens in background thread - Supports both push and pull producers - Push producers get paused if the consumer falls behind
* | Fix typo in thumbnail resource causing access times to be incorrectErik Johnston2018-01-181-2/+2
| |
* | Merge pull request #2810 from matrix-org/rav/metrics_fixesRichard van der Hoff2018-01-181-2/+4
|\ \ | | | | | | Fix bugs in block metrics
| * | Fix bugs in block metricsRichard van der Hoff2018-01-181-2/+4
|/ / | | | | | | ... which I introduced in #2785
* | Merge pull request #2809 from matrix-org/rav/metrics_errorsRichard van der Hoff2018-01-181-1/+8
|\ \ | | | | | | better exception logging in callbackmetrics
| * | better exception logging in callbackmetricsRichard van der Hoff2018-01-181-1/+8
| | | | | | | | | | | | when we fail to render a metric, give a clue as to which metric it was
* | | Merge pull request #2805 from matrix-org/rav/log_state_resRichard van der Hoff2018-01-171-0/+6
|\ \ \ | |/ / |/| | Log room when doing state resolution
| * | Log room when doing state resolutionRichard van der Hoff2018-01-171-0/+6
| | | | | | | | | | | | Mostly because it helps figure out what is prompting the resolution
* | | Merge pull request #2783 from matrix-org/erikj/media_last_accessedErik Johnston2018-01-175-11/+64
|\ \ \ | | | | | | | | Keep track of last access time for local media
| * | | Remove lost commentErik Johnston2018-01-171-3/+0
| | | |
| * | | Update last access time when thumbnails are viewedErik Johnston2018-01-171-0/+2
| | | |
| * | | Keep track of last access time for local mediaErik Johnston2018-01-174-11/+65
| | |/ | |/|
* | | Merge pull request #2803 from matrix-org/matthew/fix-userdir-sqlMatthew Hodgson2018-01-171-2/+7
|\ \ \ | | | | | | | | fix SQL when searching all users
| * | | fix SQL when searching all usersMatthew Hodgson2018-01-171-2/+7
| | | |
* | | | Merge pull request #2802 from matrix-org/rav/clean_up_resolve_eventsRichard van der Hoff2018-01-172-20/+29
|\ \ \ \ | |/ / / |/| | | Split resolve_events into two functions
| * | | Split resolve_events into two functionsRichard van der Hoff2018-01-172-20/+29
|/ / / | | | | | | | | | ... so that the return type doesn't depend on the arg types
* | | Merge pull request #2795 from matrix-org/rav/track_db_schedulingRichard van der Hoff2018-01-175-4/+43
|\ \ \ | | | | | | | | Track DB scheduling delay per-request
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/track_db_schedulingRichard van der Hoff2018-01-175-34/+78
| |\ \ \
| * | | | Track DB scheduling delay per-requestRichard van der Hoff2018-01-165-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each request, track the amount of time spent waiting for a db connection. This entails adding it to the LoggingContext and we may as well add metrics for it while we are passing.
| * | | | Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_schedulingRichard van der Hoff2018-01-166-31/+49
| |\ \ \ \
* | \ \ \ \ Merge pull request #2797 from matrix-org/rav/user_id_checkingRichard van der Hoff2018-01-172-8/+19
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Sanity checking for user ids
| * | | | | Sanity checking for user idsRichard van der Hoff2018-01-172-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the user_id passed to a couple of APIs for validity, to avoid "IndexError: list index out of range" exception which looks scary and results in a 500 rather than a more useful error. Fixes #1432, among other things
* | | | | | Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millisRichard van der Hoff2018-01-174-10/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Track db txn time in millisecs
| * | | | | | Merge branch 'develop' into rav/db_txn_time_in_millisRichard van der Hoff2018-01-174-25/+69
| |\| | | | | | | |_|/ / / | |/| | | |
| * | | | | Track db txn time in millisecsRichard van der Hoff2018-01-164-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | ... to reduce the amount of floating-point foo we do.
* | | | | | Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errorsRichard van der Hoff2018-01-171-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix 'NoneType' object has no attribute 'writeHeaders'
| * \ \ \ \ \ Merge branch 'develop' into rav/fix_closed_connection_errorsRichard van der Hoff2018-01-177-47/+102
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Fix 'NoneType' object has no attribute 'writeHeaders'Richard van der Hoff2018-01-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid throwing a (harmless) exception when we try to write an error response to an http request where the client has disconnected. This comes up as a CRITICAL error in the logs which tends to mislead people into thinking there's an actual problem
* | | | | | | Merge pull request #2794 from matrix-org/rav/rework_run_interactionRichard van der Hoff2018-01-171-20/+31
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | rework runInteraction in terms of runConnection
| * | | | | | Merge branch 'develop' into rav/rework_run_interactionRichard van der Hoff2018-01-177-47/+102
| |\ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2792 from matrix-org/rav/optimise_logging_contextRichard van der Hoff2018-01-173-22/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Optimise LoggingContext creation and copying
| * | | | | Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_contextRichard van der Hoff2018-01-174-25/+69
| |\ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
* | | | | Merge pull request #2789 from matrix-org/erikj/fix_thumbnailsErik Johnston2018-01-173-24/+68
|\ \ \ \ \ | | | | | | | | | | | | Fix thumbnailing remote files
| * | | | | Add docstringErik Johnston2018-01-171-1/+1
| | | | | |
| * | | | | Use local varsErik Johnston2018-01-161-6/+2
| | | | | |
| * | | | | Change _generate_thumbnails to take media_typeErik Johnston2018-01-162-7/+10
| | | | | |
| * | | | | Move setting of file_id up to callerErik Johnston2018-01-162-13/+14
| | | | | |
| * | | | | Fix typoErik Johnston2018-01-161-7/+10
| | | | | |
| * | | | | Fix up log linesErik Johnston2018-01-162-7/+10
| | | | | |
| * | | | | Correctly use server_name/file_id when generating/fetching remote thumbnailsErik Johnston2018-01-162-5/+8
| | | | | |
| * | | | | Log when we respond with 404Erik Johnston2018-01-162-1/+8
| | | | | |
| * | | | | Fix thumbnailing remote filesErik Johnston2018-01-162-2/+30
| | | | | |
* | | | | | fix typoMatthew Hodgson2018-01-161-1/+1
| |_|_|/ / |/| | | |
| | * | | Optimise LoggingContext creation and copyingRichard van der Hoff2018-01-163-22/+33
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that the only thing we use the __dict__ of LoggingContext for is `request`, and given we create lots of LoggingContexts and then copy them every time we do a db transaction or log line, using the __dict__ seems a bit redundant. Let's try to optimise things by making the request attribute explicit.
| | * | rework runInteraction in terms of runConnectionRichard van der Hoff2018-01-161-20/+31
| |/ / |/| | | | | | | | ... so that we can share the code
* | | Merge pull request #2785 from matrix-org/rav/reorganise_metrics_againRichard van der Hoff2018-01-165-47/+209
|\ \ \ | | | | | | | | Reorganise request and block metrics
| * | | document metrics changesRichard van der Hoff2018-01-162-8/+58
| | | |
| * | | Reorganise request and block metricsRichard van der Hoff2018-01-152-25/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to circumvent the number of duplicate foo:count metrics increasing without bounds, it's time for a rearrangement. The following are all deprecated, and replaced with synapse_util_metrics_block_count: synapse_util_metrics_block_timer:count synapse_util_metrics_block_ru_utime:count synapse_util_metrics_block_ru_stime:count synapse_util_metrics_block_db_txn_count:count synapse_util_metrics_block_db_txn_duration:count The following are all deprecated, and replaced with synapse_http_server_response_count: synapse_http_server_requests synapse_http_server_response_time:count synapse_http_server_response_ru_utime:count synapse_http_server_response_ru_stime:count synapse_http_server_response_db_txn_count:count synapse_http_server_response_db_txn_duration:count The following are renamed (the old metrics are kept for now, but deprecated): synapse_util_metrics_block_timer:total -> synapse_util_metrics_block_time_seconds synapse_util_metrics_block_ru_utime:total -> synapse_util_metrics_block_ru_utime_seconds synapse_util_metrics_block_ru_stime:total -> synapse_util_metrics_block_ru_stime_seconds synapse_util_metrics_block_db_txn_count:total -> synapse_util_metrics_block_db_txn_count synapse_util_metrics_block_db_txn_duration:total -> synapse_util_metrics_block_db_txn_duration_seconds synapse_http_server_response_time:total -> synapse_http_server_response_time_seconds synapse_http_server_response_ru_utime:total -> synapse_http_server_response_ru_utime_seconds synapse_http_server_response_ru_stime:total -> synapse_http_server_response_ru_stime_seconds synapse_http_server_response_db_txn_count:total -> synapse_http_server_response_db_txn_count synapse_http_server_response_db_txn_duration:total synapse_http_server_response_db_txn_duration_seconds
| * | | mechanism to render metrics with alternative namesRichard van der Hoff2018-01-151-13/+40
| | | |
| * | | Add some comments to metrics classesRichard van der Hoff2018-01-151-1/+27
| | | |
* | | | Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leakRichard van der Hoff2018-01-161-1/+8
|\ \ \ \ | | | | | | | | | | Fix a logcontext leak in persist_events
| * | | | Fix a logcontext leak in persist_eventsRichard van der Hoff2018-01-161-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObserveableDeferred expects its callbacks to be called without any logcontexts, whereas it turns out we were calling them with the logcontext of the request which initiated the persistence loop. It seems wrong that we are attributing work done in the persistence loop to the request that happened to initiate it, so let's solve this by dropping the logcontext for it. (I'm not sure this actually causes any real problems other than messages in the debug log, but let's clean it up anyway)
* | | | Merge pull request #2787 from matrix-org/rav/worker_event_countsRichard van der Hoff2018-01-162-0/+11
|\ \ \ \ | | | | | | | | | | Metrics for events processed in appservice and fed sender
| * | | | Metrics for events processed in appservice and fed senderRichard van der Hoff2018-01-152-0/+11
| |/ / / | | | | | | | | | | | | More metrics I wished I'd had
* | | | Merge pull request #2786 from matrix-org/rav/rdata_metricsRichard van der Hoff2018-01-161-5/+14
|\ \ \ \ | |_|/ / |/| | | Metrics for number of RDATA commands received
| * | | Metrics for number of RDATA commands receivedRichard van der Hoff2018-01-151-5/+14
| |/ / | | | | | | | | | I found myself wishing we had this.
* | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactorErik Johnston2018-01-167-346/+843
|\ \ \ | |/ / |/| | Refactor MediaRepository to separate out storage
| * | Fix up commentsErik Johnston2018-01-122-7/+16
| | |
| * | Correctly reraise exceptionErik Johnston2018-01-121-2/+4
| | |
| * | Make Responder a context managerErik Johnston2018-01-122-9/+10
| | |
| * | Add missing class varErik Johnston2018-01-121-0/+3
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-01-129-28/+116
| |\ \ | | | | | | | | | | | | erikj/media_storage_refactor
| * | | Remove unnecessary conditionErik Johnston2018-01-121-4/+1
| | | |
| * | | Remove unused variablesErik Johnston2018-01-121-3/+0
| | | |
| * | | Make class var localErik Johnston2018-01-121-3/+3
| | | |
| * | | CommentsErik Johnston2018-01-123-15/+65
| | | |
| * | | Add StorageProvider conceptErik Johnston2018-01-093-9/+162
| | | |
| * | | Make PreviewUrlResource use MediaStorageErik Johnston2018-01-092-8/+14
| | | |
| * | | Make ThumbnailResource use MediaStorageErik Johnston2018-01-092-48/+68
| | | |
| * | | Use MediaStorage for remote mediaErik Johnston2018-01-092-136/+156
| | | |
| * | | Use MediaStorage for local filesErik Johnston2018-01-092-119/+73
| | | |
| * | | Add MediaStorage classErik Johnston2018-01-091-0/+198
| | | |
| * | | Add some helper classesErik Johnston2018-01-091-0/+73
| | | |
| * | | Split out add_file_headersErik Johnston2018-01-091-28/+42
| | | |
* | | | Merge pull request #2778 from matrix-org/rav/counters_should_be_floatsRichard van der Hoff2018-01-151-3/+10
|\ \ \ \ | |_|_|/ |/| | | Make Counter render floats
| * | | Make Counter render floatsRichard van der Hoff2018-01-121-3/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | Prometheus handles all metrics as floats, and sometimes we store non-integer values in them (notably, durations in seconds), so let's render them as floats too. (Note that the standard client libraries also treat Counters as floats.)
* | | Merge pull request #2777 from matrix-org/rav/fix_remote_thumbnailsRichard van der Hoff2018-01-121-0/+5
|\ \ \ | | | | | | | | Reinstate media download on thumbnail request
| * | | Reinstate media download on thumbnail requestRichard van der Hoff2018-01-121-0/+5
|/ / / | | | | | | | | | | | | We need to actually download the remote media when we get a request for a thumbnail.
* | | Merge pull request #2774 from matrix-org/erikj/synctlErik Johnston2018-01-123-5/+38
|\ \ \ | |_|/ |/| | When using synctl with workers, don't start the main synapse automatically
| * | Actually make it workErik Johnston2018-01-122-2/+15
| | |
| * | RefactorErik Johnston2018-01-121-9/+4
| | |
| * | When using synctl with workers, don't start the main synapse automaticallyErik Johnston2018-01-112-8/+33
| | |
* | | Merge pull request #2766 from matrix-org/rav/room_eventRichard van der Hoff2018-01-111-3/+26
|\ \ \ | |/ / |/| | Add /room/{id}/event/{id} to synapse
| * | Add /room/{id}/event/{id} to synapseRichard van der Hoff2018-01-091-3/+26
| | | | | | | | | | | | | | | | | | Turns out that there is a valid usecase for retrieving event by id (notably having received a push), but event ids should be scoped to room, so /event/{id} is wrong.
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-01-113-1/+49
|\ \ \
| * \ \ Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0Erik Johnston2018-01-0577-826/+1829
| |\ \ \
| | * | | Bump version and changelog github/release-v0.26.0 release-v0.26.0Erik Johnston2018-01-052-1/+7
| | | | |
| | * | | Fix rc version number v0.26.0-rc1Erik Johnston2017-12-131-2/+2
| | | | |
| | * | | Bump changelog and versionErik Johnston2017-12-132-1/+38
| | | | |
| * | | | Merge pull request #2737 from Valodim/masterMatthew Hodgson2017-12-171-0/+5
| |\ \ \ \ | | | | | | | | | | | | mention federation tester more prominently in the readme
| | * | | | mention federation tester more prominently in the readmeVincent Breitmoser2017-12-161-0/+5
| |/ / / /
* | | | | Merge pull request #2773 from matrix-org/erikj/hash_bgErik Johnston2018-01-103-10/+18
|\ \ \ \ \ | | | | | | | | | | | | Do bcrypt hashing in a background thread
| * | | | | Do bcrypt hashing in a background threadErik Johnston2018-01-103-10/+18
| | | | | |
* | | | | | Merge pull request #2772 from matrix-org/t3chguy/patch-1Erik Johnston2018-01-101-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix publicised groups GET API (singular) over federation
| * | | | | | fix order of operations derp and also use `.get` to default to {}Michael Telatynski2018-01-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
| * | | | | | Fix publicised groups API (singular) over federationMichael Telatynski2018-01-101-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which was missing its fed client API, since there is no other API it might as well reuse the bulk one and unwrap it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* | | | | | Merge pull request #2770 from matrix-org/rav/fix_request_metricsRichard van der Hoff2018-01-101-11/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Update http request metrics before calling servlet
| * | | | | Update http request metrics before calling servletRichard van der Hoff2018-01-091-11/+19
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Make sure that we set the servlet name in the metrics object *before* calling the servlet, in case the servlet throws an exception.
* | | | | Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_codeErik Johnston2018-01-092-78/+3
|\ \ \ \ \ | |/ / / / |/| | | | Remove dead code related to default thumbnails
| * | | | Remove dead TODOErik Johnston2018-01-091-2/+0
| | | | |
| * | | | Remove dead code related to default thumbnailsErik Johnston2018-01-092-76/+3
|/ / / /
* | | | Merge pull request #2765 from matrix-org/rav/fix_room_utsRichard van der Hoff2018-01-093-4/+9
|\ \ \ \ | | | | | | | | | | Fix flaky test_rooms UTs
| * | | | enable twisted delayedcall debugging in UTsRichard van der Hoff2018-01-091-1/+5
| | | | |
| * | | | Remove dead codeRichard van der Hoff2018-01-091-3/+0
| | | | | | | | | | | | | | | | | | | | pointless function is pointless
| * | | | Disable user_directory updates for UTsRichard van der Hoff2018-01-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fix flakiness in the UTs caused by the user_directory being updated in the background
* | | | | Merge pull request #2763 from matrix-org/rav/fix_config_utsRichard van der Hoff2018-01-092-3/+18
|\ \ \ \ \ | | | | | | | | | | | | Fix broken config UTs
| * | | | | Fix broken config UTsRichard van der Hoff2018-01-092-3/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | https://github.com/matrix-org/synapse/pull/2755 broke log-config generation, which in turn broke the unit tests.
* | | | | Merge pull request #2762 from matrix-org/rav/fix_logconfig_indentingRichard van der Hoff2018-01-091-17/+17
|\ \ \ \ \ | |/ / / / |/| | | | Make indentation of generated log config consistent
| * | | | Make indentation of generated log config consistentRichard van der Hoff2018-01-091-17/+17
|/ / / / | | | | | | | | | | | | (we had a mix of 2- and 4-space indents)
* | | | Merge pull request #2761 from turt2live/patch-1Erik Johnston2018-01-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix templating error with unban permission message
| * | | | Fix templating error with unban permission messageTravis Ralston2018-01-071-1/+1
|/ / / / | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2759 Signed-off-by: Travis Ralston <travpc@gmail.com>
* | | | Merge pull request #2755 from matrix-org/richvdh-patch-1Richard van der Hoff2018-01-051-8/+4
|\ \ \ \ | | | | | | | | | | Remove 'verbosity'/'log_file' from generated cfg
| * | | | Remove 'verbosity'/'log_file' from generated cfgRichard van der Hoff2018-01-051-8/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | ... because these only really exist to confuse people nowadays. Also bring log config more into line with the generated log config, by making `level_for_storage` apply to the `synapse.storage.SQL` logger rather than `synapse.storage`.
* | | | Merge pull request #2744 from matrix-org/rav/login_loggingRichard van der Hoff2018-01-051-4/+10
|\ \ \ \ | | | | | | | | | | Better logging when login can't find a 3pid
| * | | | Better logging when login can't find a 3pidRichard van der Hoff2017-12-201-4/+10
| | | | |
* | | | | Merge pull request #2745 from matrix-org/rav/assert_paramsRichard van der Hoff2018-01-053-60/+68
|\ \ \ \ \ | |/ / / / |/| | | | Check missing fields in event_from_pdu_json
| * | | | Check missing fields in event_from_pdu_jsonRichard van der Hoff2017-12-301-0/+7
| | | | | | | | | | | | | | | | | | | | Return a 400 rather than a 500 when somebody messes up their send_join
| * | | | Factor out `event_from_pdu_json`Richard van der Hoff2017-12-303-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | turns out we have two copies of this, and neither needs to be an instance method
| * | | | federation_server: clean up importsRichard van der Hoff2017-12-301-14/+11
| | | | |
| * | | | federation_client: clean up importsRichard van der Hoff2017-12-301-13/+10
|/ / / /
* | | | Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typoRichard van der Hoff2017-12-181-2/+2
|\ \ \ \ | | | | | | | | | | synapse/config/password_auth_providers: Fixed bracket typo
| * | | | synapse/config/password_auth_providers: Fixed bracket typoRichard von Seck2017-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard von Seck <richard.von-seck@gmx.net>
* | | | | Merge pull request #2435 from silkeh/listen-ipv6-defaultRichard van der Hoff2017-12-1812-231/+247
|\ \ \ \ \ | |_|_|_|/ |/| | | | Adapt the default config to bind on both IPv4 and IPv6 on all platforms
| * | | | Implement listen_tcp method in remaining workersSilke2017-12-1810-192/+155
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke <silke@slxh.eu>
| * | | | Remove logger argument and do not catch replication listenerSilke2017-12-182-24/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke <silke@slxh.eu>
| * | | | Add methods for listening on multiple addressesSilke Hofstra2017-12-172-51/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu>
| * | | | Allow binds to both :: and 0.0.0.0Silke Hofstra2017-12-172-42/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See #2232 Signed-off-by: Silke Hofstra <silke@slxh.eu>
| * | | | Adapt the default config to bind on IPv6.Willem Mulder2017-12-171-8/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most deployments are on Linux (or Mac OS), so this would actually bind on both IPv4 and IPv6. Resolves #1886. Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
* | | | Merge pull request #2717 from matrix-org/erikj/createroom_contentErik Johnston2017-12-072-5/+9
|\ \ \ \ | | | | | | | | | | Fix wrong avatars when inviting multiple users when creating room
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-12-0773-820/+1776
| |\ \ \ \ | |/ / / / |/| | | | | | | | | erikj/createroom_content
* | | | | Merge pull request #2723 from matrix-org/matthew/search-all-local-usersMatthew Hodgson2017-12-0511-37/+234
|\ \ \ \ \ | | | | | | | | | | | | Add all local users to the user_directory and optionally search them
| * | | | | fix StoreError syntaxMatthew Hodgson2017-12-051-1/+1
| | | | | |
| * | | | | speed up the rate of initial spam for usersMatthew Hodgson2017-12-041-11/+12
| | | | | |
| * | | | | better docMatthew Hodgson2017-12-041-1/+4
| | | | | |
| * | | | | try make tests work a bit more...Matthew Hodgson2017-12-041-0/+12
| | | | | |
| * | | | | erik told me toMatthew Hodgson2017-12-041-1/+1
| | | | | |
| * | | | | fix pep8 and testsMatthew Hodgson2017-12-043-8/+6
| | | | | |
| * | | | | switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-045-37/+30
| | | | | |
| * | | | | Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-3032-200/+633
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | specify default user_directory_include_patternMatthew Hodgson2017-11-301-0/+1
| | | | | |
| * | | | | remove null constraint on user_dir.room_idMatthew Hodgson2017-11-301-0/+35
| | | | | |
| * | | | | fix alternation operator for FTS4 - how did this ever work!?Matthew Hodgson2017-11-301-1/+1
| | | | | |
| * | | | | fix thinkos galoreMatthew Hodgson2017-11-303-20/+41
| | | | | |
| * | | | | kick the user_directory index when new users registerMatthew Hodgson2017-11-291-0/+8
| | | | | |
| * | | | | untested WIP but might actually workMatthew Hodgson2017-11-296-20/+96
| | | | | |
| * | | | | Add user_directory_include_pattern config param to expand search results to ↵Matthew Hodgson2017-11-295-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional users Initial commit; this doesn't work yet - the LIKE filtering seems too aggressive. It also needs _do_initial_spam to be aware of prepopulating the whole user_directory_search table with all users... ...and it needs a handle_user_signup() or something to be added so that new signups get incrementally added to the table too. Committing it here as a WIP
* | | | | | Fix error when deleting devicesRichard van der Hoff2017-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was introduced in d7ea8c4 / PR #2728
* | | | | | Merge pull request #2729 from matrix-org/rav/custom_ui_authRichard van der Hoff2017-12-051-24/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | support custom login types for validating users
| * | | | | | support custom login types for validating usersRichard van der Hoff2017-12-051-24/+57
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Wire the custom login type support from password providers into the UI-auth user-validation flows.
* | | | | | Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_authRichard van der Hoff2017-12-053-74/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | Factor out a validate_user_via_ui_auth method
| * | | | | | Factor out a validate_user_via_ui_auth methodRichard van der Hoff2017-12-053-74/+102
|/ / / / / / | | | | | | | | | | | | | | | | | | Collect together all the places that validate a logged-in user via UI auth.
* | | | | | Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_returnRichard van der Hoff2017-12-057-48/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor UI auth implementation
| * | | | | | Refactor UI auth implementationRichard van der Hoff2017-12-057-48/+103
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper.
* | | | | | Merge pull request #2716 from matrix-org/rav/federation_client_postRichard van der Hoff2017-12-041-8/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | | federation_client script: Support for posting content
| * | | | | federation_client script: Support for posting contentRichard van der Hoff2017-11-281-8/+34
| | | | | |
* | | | | | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_commentsRichard van der Hoff2017-11-291-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve comments on get_user_by_access_token
| * | | | | | Improve comments on get_user_by_access_tokenRichard van der Hoff2017-11-291-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | because I have to reverse-engineer this every time.
* | | | | | Merge pull request #2722 from matrix-org/rav/delete_device_on_logoutRichard van der Hoff2017-11-2912-64/+226
|\ \ \ \ \ \ | | | | | | | | | | | | | | Delete devices and pushers on logouts etc
| * | | | | | Delete devices in various logout situationsRichard van der Hoff2017-11-295-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we delete devices whenever a user is logged out due to any of the following situations: * /logout * /logout_all * change password * deactivate account (by the user or by an admin) * invalidate access token from a dynamic module Fixes #2672.
| * | | | | | Move set_password into its own handlerRichard van der Hoff2017-11-296-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-functional refactoring to move set_password. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.
| * | | | | | Move deactivate_account into its own handlerRichard van der Hoff2017-11-296-22/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-functional refactoring to move deactivate_account. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.
| * | | | | | Remove pushers when deleting access tokensRichard van der Hoff2017-11-293-18/+32
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Whenever an access token is invalidated, we should remove the associated pushers.
* | | | | | Merge pull request #2718 from matrix-org/rav/notify_logcontextsRichard van der Hoff2017-11-292-9/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clear logcontext before starting fed txn queue runner
| * | | | | | Clear logcontext before starting fed txn queue runnerRichard van der Hoff2017-11-282-9/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | These processes take a long time compared to the request, so there is lots of "Entering|Restoring dead context" in the logs. Let's try to shut it up a bit.
* | | | | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashesRichard van der Hoff2017-11-291-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix 500 when joining matrix-dev
| * | | | | | Fix 500 when joining matrix-devRichard van der Hoff2017-11-291-3/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-dev has an event (`$/6ANj/9QWQyd71N6DpRQPf+SDUu11+HVMeKSpMzBCwM:zemos.net`) which has no `hashes` member. Check for missing `hashes` element in events.
* | | | | | Merge pull request #2715 from matrix-org/luke/group-guest-accessLuke Barnard2017-11-281-11/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow guest access to group APIs for reading
| * | | | | Allow guest access to group APIs for readingLuke Barnard2017-11-281-11/+11
|/ / / / /
* | | | | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_errorRichard van der Hoff2017-11-276-17/+89
|\ \ \ \ \ | | | | | | | | | | | | Fix error on sqlite 3.7
| * | | | | fix sql failsRichard van der Hoff2017-11-221-1/+1
| | | | | |
| * | | | | Check database in has_completed_background_updatesRichard van der Hoff2017-11-223-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | so that the right thing happens on workers.
| * | | | | Fix error on sqlite 3.7Richard van der Hoff2017-11-215-8/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the url_cache index on local_media_repository as a background update, so that we can detect whether we are on sqlite or not and create a partial or complete index accordingly. To avoid running the cleanup job before we have built the index, add a bailout which will defer the cleanup if the bg updates are still running. Fixes https://github.com/matrix-org/synapse/issues/2572.
* | | | | | Merge pull request #2713 from matrix-org/rav/no_upsert_foreverRichard van der Hoff2017-11-271-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid retrying forever on IntegrityError
| * | | | | | Avoid retrying forever on IntegrityErrorRichard van der Hoff2017-11-271-0/+7
| | | | | | |
* | | | | | | Merge pull request #2711 from matrix-org/rav/fix_dns_errhandlerRichard van der Hoff2017-11-271-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix error handling on dns lookup
| * | | | | | | Fix error handling on dns lookupRichard van der Hoff2017-11-241-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass the right arguments to the errback handler Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)"
* | | | | | | Merge pull request #2710 from matrix-org/rav/remove_dead_codeRichard van der Hoff2017-11-271-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Tiny code cleanups
| * | | | | | | Add a comment which might save some confusionRichard van der Hoff2017-11-241-0/+1
| | | | | | | |
| * | | | | | | Remove dead sync_callbackRichard van der Hoff2017-11-241-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This is never used; let's remove it to stop confusing things.
* | | | | | | Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaksRichard van der Hoff2017-11-271-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix some logcontext leaks in replication resource
| * | | | | | | Fix some logcontext leaks in replication resourceRichard van der Hoff2017-11-231-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work.
* | | | | | | Merge pull request #2707 from matrix-org/rav/fix_urlpreviewRichard van der Hoff2017-11-271-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix OPTIONS on preview_url
| * | | | | | | Fix OPTIONS on preview_urlRichard van der Hoff2017-11-231-1/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #2706
* | | | | | | Merge pull request #2705 from matrix-org/rav/improve_tracebacksRichard van der Hoff2017-11-271-3/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Improve tracebacks on exceptions
| * | | | | | Improve tracebacks on exceptionsRichard van der Hoff2017-11-271-3/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception.
* | | | | | Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_allRichard van der Hoff2017-11-226-13/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Try to avoid having multiple PreviewUrlResource instances
| * | | | | | Add config option to disable media_repo on main synapseRichard van der Hoff2017-11-224-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to stop us doing the cache cleanup jobs on the master.
| * | | | | | Build MediaRepositoryResource as a homeserver dependencyRichard van der Hoff2017-11-224-5/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the scenario where we have four different PreviewUrlResources configured on a single app, each of which have their own caches and cache clearing jobs.
* | | | | | Merge pull request #2700 from matrix-org/rav/worker_docsRichard van der Hoff2017-11-211-21/+133
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve documentation of workers Fixes https://github.com/matrix-org/synapse/issues/2554
| * | | | | | Improve documentation of workersRichard van der Hoff2017-11-211-21/+133
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2554
* | | | | | Merge pull request #2698 from matrix-org/rav/remove_dead_dependenciesRichard van der Hoff2017-11-211-16/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clean up dependency list
| * | | | | | Clean up dependency listRichard van der Hoff2017-11-211-16/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | remove those that aren't used at all, and replace the ones that don't have builders with simple getters rather than dynamically-generated methods.
* | | | | | Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsertRichard van der Hoff2017-11-211-36/+49
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Avoid locking account_data tables for upserts
| * | | | | Avoid locking account_data tables for upsertsRichard van der Hoff2017-11-161-36/+49
| | | | | |
* | | | | | sanity checksMatthew Hodgson2017-11-211-1/+4
| |/ / / / |/| | | |
* | | | | don't double-invite in sync_room_to_group.plMatthew Hodgson2017-11-191-3/+6
| | | | |
* | | | | Merge pull request #2688 from matrix-org/rav/unlock_more_upsertRichard van der Hoff2017-11-172-5/+51
|\ \ \ \ \ | | | | | | | | | | | | Avoid locking for upsert on pushers tables
| * | | | | Avoid locking for upsert on pushers tablesRichard van der Hoff2017-11-162-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replace the upsert into deleted_pushers with an insert * no need to lock for upsert on pusher_throttle
* | | | | | Merge branch 'master' into developRichard van der Hoff2017-11-172-1/+9
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2686 from matrix-org/luke/as-flairLuke Barnard2017-11-174-1/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add automagical AS Publicised Group(s)
| * | | | | | Add extra space before inline commentLuke Barnard2017-11-161-1/+1
| | | | | | |
| * | | | | | Extract group_id from the dict for multiple useLuke Barnard2017-11-161-4/+5
| | | | | | |
| * | | | | | Fix testsLuke Barnard2017-11-161-0/+1
| | | | | | |
| * | | | | | Remove unused GROUP_ID_REGEXLuke Barnard2017-11-161-2/+0
| | | | | | |
| * | | | | | Document get_groups_for_userLuke Barnard2017-11-161-0/+6
| | | | | | |
| * | | | | | Flake8Luke Barnard2017-11-161-1/+1
| | | | | | |
| * | | | | | Use a generator instead of a listLuke Barnard2017-11-161-2/+2
| | | | | | |
| * | | | | | Make sure we check AS groups for lookup on bulkLuke Barnard2017-11-161-0/+5
| | | | | | |
| * | | | | | Check group_id belongs to this domainLuke Barnard2017-11-162-3/+12
| | | | | | |
| * | | | | | Add automagical AS Publicised Group(s)Luke Barnard2017-11-162-0/+28
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via registration file "users" namespace: ```YAML ... namespaces: users: - exclusive: true regex: '.*luke.*' group_id: '+all_the_lukes:hsdomain' ... ``` This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API.
* | | | | | typoMatthew Hodgson2017-11-171-1/+1
| | | | | |
* | | | | | quick and dirty room membership<->group membership sync scriptMatthew Hodgson2017-11-171-0/+39
| |_|_|/ / |/| | | |
* | | | | Fix auth handler #2678Jurek2017-11-161-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #2684 from matrix-org/rav/unlock_upsertRichard van der Hoff2017-11-162-49/+74
|\ \ \ \ | |/ / / |/| | | Start work on avoiding table locks for upserts
| * | | Fix broken ref to IntegrityErrorRichard van der Hoff2017-11-161-1/+1
| | | |
| * | | Avoid locking `pushers` table on upsertRichard van der Hoff2017-11-161-27/+28
| | | | | | | | | | | | | | | | | | | | Now that _simple_upsert will retry on IntegrityError, we don't need to lock the table.
| * | | _simple_upsert: retry on IntegrityErrorRichard van der Hoff2017-11-161-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | wrap the call to _simple_upsert_txn in a loop so that we retry on an integrityerror: this means we can avoid locking the table provided there is an unique index.
| * | | Cleanup in _simple_upsert_txnRichard van der Hoff2017-11-161-16/+17
|/ / / | | | | | | | | | Bail out early to reduce indentation
* | | Merge pull request #2661 from matrix-org/rav/statereadstoreRichard van der Hoff2017-11-153-249/+237
|\ \ \ | | | | | | | | Pull out bits of StateStore to a mixin
| * | | Pull out bits of StateStore to a mixinRichard van der Hoff2017-11-142-237/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so that we don't need to secretly gut-wrench it for use in the slaved stores. I haven't done the other stores yet, but we should. I'm tired of the workers breaking every time we tweak the stores because I forgot to gut-wrench the right method. fixes https://github.com/matrix-org/synapse/issues/2655.
| * | | Revert "Revert "move _state_group_cache to statestore""Richard van der Hoff2017-11-142-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to fix this properly on this branch, so that the _state_group_cache can end up in StateGroupReadStore. This reverts commit ab335edb023d66cd0be439e045b10ca104b73cb5.
* | | | Merge pull request #2677 from matrix-org/rav/spec_r0.3.0Richard van der Hoff2017-11-151-0/+1
|\ \ \ \ | | | | | | | | | | Declare support for r0.3.0
| * | | | Declare support for r0.3.0Richard van der Hoff2017-11-151-0/+1
| | | | |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-11-151-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcsRichard van der Hoff2017-11-1510-96/+23
|\ \ \ \ \ | | | | | | | | | | | | Remove preserve_context_over_{fn, deferred}
| * | | | | Remove __PreservingContextDeferred tooRichard van der Hoff2017-11-141-30/+0
| | | | | |
| * | | | | Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-1410-66/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off.
* | | | | | Merge pull request #2650 from matrix-org/dbkr/push_include_content_optionDavid Baker2017-11-152-15/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename redact_content option to include_content
| * | | | | | Print instead of loggingDavid Baker2017-11-131-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | because we had to wait until the logger was set up
| * | | | | | Make the commented config have the defaultDavid Baker2017-11-091-1/+1
| | | | | | |
| * | | | | | better commentsDavid Baker2017-11-081-2/+5
| | | | | | |
| * | | | | | Log if any of the old config flags are setDavid Baker2017-11-081-2/+24
| | | | | | |
| * | | | | | Rename redact_content option to include_contentDavid Baker2017-11-082-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redact_content option never worked because it read the wrong config section. The PR introducing it (https://github.com/matrix-org/synapse/pull/2301) had feedback suggesting the name be changed to not re-use the term 'redact' but this wasn't incorporated. This reanmes the option to give it a less confusing name, and also means that people who've set the redact_content option won't suddenly see a behaviour change when upgrading synapse, but instead can set include_content if they want to. This PR also updates the wording of the config comment to clarify that this has no effect on event_id_only push. Includes https://github.com/matrix-org/synapse/pull/2422
* | | | | | | Merge pull request #2648 from krombel/update_prometheusRichard van der Hoff2017-11-143-1/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | update prometheus-config to new format
| * | | | | | | Make clear that the config has changed since prometheus v2Krombel2017-11-143-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the config that is usable for prometheus pre v2.0.0 The new config only works for Prometheus v2+
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-06 11:42:37 +0000