dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-10-16 00:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,386 Commits 1,226 Branches 854 Tags
d0365bc8b09fe94701db2eee6862348cda170d10
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard van der Hoff 5ea624b0f5 CONTRIBUTING.rst: fix CI info 2018-03-15 11:48:35 +00:00
Richard van der Hoff 0ad5125814 Update purge_history_api.rst 
clarify that `purge_history` will not purge state
 2018-03-15 11:05:42 +00:00
Richard van der Hoff 068c21ab10 CHANGES.rst: reword metric deprecation 2018-03-15 10:36:31 +00:00
Richard van der Hoff 299fd740c7 Merge pull request #2975 from matrix-org/rav/measure_persist_events 
Add Measure block for persist_events
 2018-03-13 12:06:25 +00:00
Richard van der Hoff d65ceb4b48 Merge pull request #2962 from matrix-org/rav/purge_history_txns 
Add transactional API to history purge
 2018-03-12 16:32:18 +00:00
Richard van der Hoff b984dd0b73 Merge pull request #2961 from matrix-org/rav/run_in_background 
Factor run_in_background out from preserve_fn
 2018-03-12 16:19:13 +00:00
Richard van der Hoff ba1d08bc4b Merge pull request #2965 from matrix-org/rav/request_logging 
Add a metric which increments when a request is received
 2018-03-12 09:45:33 +00:00
Richard van der Hoff 8ffaacbee3 Merge pull request #2949 from krombel/use_bcrypt_checkpw 
use bcrypt.checkpw
 2018-03-06 11:56:06 +00:00
Richard van der Hoff b2932107bb Merge pull request #2946 from matrix-org/rav/timestamp_to_purge 
Implement purge_history by timestamp
 2018-03-06 11:20:23 +00:00
Richard van der Hoff d032785aa7 Merge pull request #2943 from matrix-org/rav/fix_find_first_stream_ordering_after_ts 
Test and fix find_first_stream_ordering_after_ts
 2018-03-05 12:26:14 +00:00
Richard van der Hoff 2324124a72 Merge pull request #2921 from matrix-org/rav/unyielding_make_deferred_yieldable 
Rewrite make_deferred_yieldable avoiding inlineCallbacks
 2018-03-01 15:39:10 +00:00
Richard van der Hoff 3fc33bae8b Merge pull request #2888 from bachp/pynacl-1.2.1 
Update pynacl dependency to 1.2.1 or higher
 2018-02-19 14:37:51 +00:00
Richard van der Hoff a71a080cd2 Merge pull request #2882 from matrix-org/rav/fix_purge_tablescan 
(Really) fix tablescan of event_push_actions on purge
 2018-02-16 15:18:47 +00:00
Richard van der Hoff b8d821aa68 Merge pull request #2867 from matrix-org/rav/rework_purge 
purge_history cleanups
 2018-02-15 09:49:07 +00:00
Richard van der Hoff d28ec43e15 Merge pull request #2769 from matrix-org/matthew/hit_the_gin 
switch back from GIST to GIN indexes
 2018-02-14 16:59:03 +00:00
Richard van der Hoff bfdf7b9237 Merge pull request #2864 from matrix-org/rav/persist_event_caching 
Use StateResolutionHandler to resolve state in persist_events
 2018-02-13 14:45:57 +00:00
Richard van der Hoff 630caf8a70 style nit 2018-02-13 14:29:22 +00:00
Richard van der Hoff 4d09366656 Merge pull request #2695 from okurz/feature/allow_recent_pysaml 
Allow use of higher versions of saml2
 2018-02-13 12:24:08 +00:00
Richard van der Hoff 10b34dbb9a Merge pull request #2858 from matrix-org/rav/purge_updates 
delete_local_events for purge_room_history
 2018-02-09 14:11:00 +00:00
Richard van der Hoff b31bf0bb51 Merge pull request #2849 from matrix-org/rav/clean_up_state_delta 
Remove redundant return value from _calculate_state_delta
 2018-02-05 17:42:20 +01:00
Richard van der Hoff 9a304ef2b0 Merge pull request #2848 from matrix-org/rav/refactor_search_insert 
Factor out common code for search insert
 2018-02-05 17:42:09 +01:00
Richard van der Hoff db91e72ade Merge pull request #2844 from matrix-org/rav/evicted_metrics 
montoring metrics for number of cache evictions
 2018-02-05 16:34:36 +01:00
Richard van der Hoff 9c9356512e Merge pull request #2845 from matrix-org/rav/urlcache_error_handling 
Handle url_previews with no content-type
 2018-02-02 15:27:52 +01:00
Richard van der Hoff 18eae413af Merge pull request #2842 from matrix-org/rav/state_resolution_handler 
Factor out resolve_state_groups to a separate handler
 2018-02-02 15:27:35 +01:00
Richard van der Hoff 78d6ddba86 Merge pull request #2841 from matrix-org/rav/refactor_calc_state_delta 
factor _get_new_state_after_events out of _calculate_state_delta
 2018-02-02 15:27:15 +01:00
Richard van der Hoff 9dcd667ac2 Merge pull request #2836 from matrix-org/rav/resolve_state_events_docstring 
Docstring fixes
 2018-02-02 15:26:49 +01:00
Richard van der Hoff 33cac3dc29 Merge pull request #2818 from turt2live/travis/admin-list-media 
Add an admin route to get all the media in a room
 2018-02-02 11:41:03 +01:00
Richard van der Hoff 77c0629ebc Merge pull request #2837 from matrix-org/rav/fix_quarantine_media 
Fix sql error in quarantine_media
 2018-02-01 11:45:58 +01:00
Richard van der Hoff 78e7e05188 Merge pull request #2838 from matrix-org/rav/fix_logging_on_dns_fail 
Remove spurious log argument
 2018-01-31 22:18:46 +01:00
Richard van der Hoff ad48dfe73d Merge pull request #2835 from matrix-org/rav/remove_event_type_param 
Remove unused "event_type" param on state.get_current_state_ids
 2018-01-31 22:17:57 +01:00
Richard van der Hoff 518a74586c Merge pull request #2834 from matrix-org/rav/better_persist_event_exception_handling 
Improve exception handling in persist_event
 2018-01-31 22:17:38 +01:00
Richard van der Hoff d1fe4db882 Merge pull request #2833 from matrix-org/rav/pusher_hacks 
Logging and metrics for the http pusher
 2018-01-31 22:16:59 +01:00
Richard van der Hoff 421d68ca8c Merge pull request #2817 from matrix-org/rav/http_conn_pool 
Use a connection pool for the SimpleHttpClient
 2018-01-31 22:14:22 +01:00
Richard van der Hoff 4c65b98e4a Merge pull request #2831 from matrix-org/rav/fix-userdir-search-again 
Fix SQL for user search
 2018-01-27 22:58:24 +01:00
Richard van der Hoff 2186d7c06e Merge pull request #2829 from matrix-org/rav/postgres_in_tests 
Make it possible to run tests against postgres
 2018-01-27 18:20:55 +01:00
Richard van der Hoff d8f90c4208 Merge pull request #2828 from matrix-org/rav/kill_memory_datastore 
Remove unused/bitrotted MemoryDataStore
 2018-01-27 17:57:02 +01:00
Richard van der Hoff 4b0f06e99c Merge pull request #2830 from matrix-org/rav/factor_out_get_conn 
Factor out get_db_conn to HomeServer base class
 2018-01-27 17:56:25 +01:00
Richard van der Hoff 25e2456ee7 Merge pull request #2816 from matrix-org/rav/metrics_comments 
Add some comments about the reactor tick time metric
 2018-01-23 19:39:26 +00:00
Richard van der Hoff b2da272b77 Merge pull request #2821 from matrix-org/rav/matthew_test_fixes 
Matthew's fixes to the unit tests
 2018-01-22 20:43:56 +00:00
Richard van der Hoff b0d9e633ee Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs 
Use the right path for url_preview thumbnails
 2018-01-19 18:57:15 +00:00
Richard van der Hoff 5a4da21d58 Merge pull request #2810 from matrix-org/rav/metrics_fixes 
Fix bugs in block metrics
 2018-01-18 13:35:28 +00:00
Richard van der Hoff d6af5512bb Merge pull request #2809 from matrix-org/rav/metrics_errors 
better exception logging in callbackmetrics
 2018-01-18 11:46:37 +00:00
Richard van der Hoff 36da256cc6 Merge pull request #2805 from matrix-org/rav/log_state_res 
Log room when doing state resolution
 2018-01-17 18:05:04 +00:00
Richard van der Hoff 8716eb4920 Merge pull request #2802 from matrix-org/rav/clean_up_resolve_events 
Split resolve_events into two functions
 2018-01-17 16:01:33 +00:00
Richard van der Hoff a7e4ff9cca Merge pull request #2795 from matrix-org/rav/track_db_scheduling 
Track DB scheduling delay per-request
 2018-01-17 14:29:37 +00:00
Richard van der Hoff f884cfffb9 Merge pull request #2797 from matrix-org/rav/user_id_checking 
Sanity checking for user ids
 2018-01-17 14:29:12 +00:00
Richard van der Hoff fb6563b4be Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millis 
Track db txn time in millisecs
 2018-01-17 13:52:42 +00:00
Richard van der Hoff 1954e867b4 Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errors 
Fix 'NoneType' object has no attribute 'writeHeaders'
 2018-01-17 13:52:24 +00:00
Richard van der Hoff f23b4078c0 Merge pull request #2794 from matrix-org/rav/rework_run_interaction 
rework runInteraction in terms of runConnection
 2018-01-17 13:50:42 +00:00
Richard van der Hoff 1067b96364 Merge pull request #2792 from matrix-org/rav/optimise_logging_context 
Optimise LoggingContext creation and copying
 2018-01-17 11:19:28 +00:00
Richard van der Hoff febdca4b37 Merge pull request #2785 from matrix-org/rav/reorganise_metrics_again 
Reorganise request and block metrics
 2018-01-16 14:10:21 +00:00
Richard van der Hoff f5f89fda21 Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leak 
Fix a logcontext leak in persist_events
 2018-01-16 14:09:13 +00:00
Richard van der Hoff 5b527d7ee1 Merge pull request #2674 from her001/readme-sytest 
Mention SyTest in the README, after Development
 2018-01-16 13:18:17 +00:00
Richard van der Hoff 807e848f0f Merge pull request #2787 from matrix-org/rav/worker_event_counts 
Metrics for events processed in appservice and fed sender
 2018-01-16 13:14:09 +00:00
Richard van der Hoff 4a31a61ef9 Merge pull request #2786 from matrix-org/rav/rdata_metrics 
Metrics for number of RDATA commands received
 2018-01-16 13:13:53 +00:00
Richard van der Hoff 5e16c1dc8c Merge pull request #2778 from matrix-org/rav/counters_should_be_floats 
Make Counter render floats
 2018-01-15 14:09:53 +00:00
Richard van der Hoff 0fc2362d37 Merge pull request #2777 from matrix-org/rav/fix_remote_thumbnails 
Reinstate media download on thumbnail request
 2018-01-12 19:12:31 +00:00
Richard van der Hoff 5f23b6d5ea Merge pull request #2766 from matrix-org/rav/room_event 
Add /room/{id}/event/{id} to synapse
 2018-01-11 14:47:18 +00:00
Richard van der Hoff c175a5f0f2 Merge pull request #2770 from matrix-org/rav/fix_request_metrics 
Update http request metrics before calling servlet
 2018-01-10 14:53:40 +00:00
Richard van der Hoff a767f06e3f Merge pull request #2765 from matrix-org/rav/fix_room_uts 
Fix flaky test_rooms UTs
 2018-01-09 14:21:03 +00:00
Richard van der Hoff cb66a2d387 Merge pull request #2763 from matrix-org/rav/fix_config_uts 
Fix broken config UTs
 2018-01-09 12:08:08 +00:00
Richard van der Hoff aed4e4ecdd Merge pull request #2762 from matrix-org/rav/fix_logconfig_indenting 
Make indentation of generated log config consistent
 2018-01-09 12:07:56 +00:00
Richard van der Hoff e6b24663e4 Merge pull request #2755 from matrix-org/richvdh-patch-1 
Remove 'verbosity'/'log_file' from generated cfg
 2018-01-05 14:17:46 +00:00
Richard van der Hoff 840f72356e Remove 'verbosity'/'log_file' from generated cfg 
... 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`.
 2018-01-05 12:30:28 +00:00
Richard van der Hoff 6e375f4597 Merge pull request #2744 from matrix-org/rav/login_logging 
Better logging when login can't find a 3pid
 2018-01-05 09:54:39 +00:00
Richard van der Hoff efdfd5c835 Merge pull request #2745 from matrix-org/rav/assert_params 
Check missing fields in event_from_pdu_json
 2018-01-05 09:52:39 +00:00
Richard van der Hoff 3f9f1c50f3 Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo 
synapse/config/password_auth_providers: Fixed bracket typo
 2017-12-18 22:37:21 +00:00
Richard van der Hoff 48fa4e1e5b Merge pull request #2435 from silkeh/listen-ipv6-default 
Adapt the default config to bind on both IPv4 and IPv6 on all platforms
 2017-12-18 22:34:50 +00:00
Richard van der Hoff 8529874368 Merge pull request #2729 from matrix-org/rav/custom_ui_auth 
support custom login types for validating users
 2017-12-05 09:43:43 +00:00
Richard van der Hoff cc58e177f3 Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_auth 
Factor out a validate_user_via_ui_auth method
 2017-12-05 09:42:46 +00:00
Richard van der Hoff aa6ecf0984 Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_return 
Refactor UI auth implementation
 2017-12-05 09:40:38 +00:00
Richard van der Hoff 58ebdb037c Merge pull request #2716 from matrix-org/rav/federation_client_post 
federation_client script: Support for posting content
 2017-12-04 17:04:08 +00:00
Richard van der Hoff 624c46eb06 Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments 
Improve comments on get_user_by_access_token
 2017-11-29 17:57:06 +00:00
Richard van der Hoff 7a48a6b63e Merge pull request #2722 from matrix-org/rav/delete_device_on_logout 
Delete devices and pushers on logouts etc
 2017-11-29 17:56:46 +00:00
Richard van der Hoff 97d1a1dc01 Merge pull request #2718 from matrix-org/rav/notify_logcontexts 
Clear logcontext before starting fed txn queue runner
 2017-11-29 16:01:46 +00:00
Richard van der Hoff 8b45de90a4 Merge pull request #2719 from matrix-org/rav/handle_missing_hashes 
Fix 500 when joining matrix-dev
 2017-11-29 16:01:33 +00:00
Richard van der Hoff 5a4da5bf78 Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error 
Fix error on sqlite 3.7
 2017-11-27 12:25:48 +00:00
Richard van der Hoff 84b31a3e7a Merge pull request #2713 from matrix-org/rav/no_upsert_forever 
Avoid retrying forever on IntegrityError
 2017-11-27 12:19:35 +00:00
Richard van der Hoff df6c72ede3 Merge pull request #2711 from matrix-org/rav/fix_dns_errhandler 
Fix error handling on dns lookup
 2017-11-27 12:19:18 +00:00
Richard van der Hoff 04bb79f139 Merge pull request #2710 from matrix-org/rav/remove_dead_code 
Tiny code cleanups
 2017-11-27 12:15:44 +00:00
Richard van der Hoff e828a7380a Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaks 
Fix some logcontext leaks in replication resource
 2017-11-27 12:15:33 +00:00
Richard van der Hoff 7ef22a41a3 Merge pull request #2707 from matrix-org/rav/fix_urlpreview 
Fix OPTIONS on preview_url
 2017-11-27 12:15:14 +00:00
Richard van der Hoff 96387bd26f Merge pull request #2705 from matrix-org/rav/improve_tracebacks 
Improve tracebacks on exceptions
 2017-11-27 12:07:52 +00:00
Richard van der Hoff 79eba878a7 Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all 
Try to avoid having multiple PreviewUrlResource instances
 2017-11-22 16:46:09 +00:00
Richard van der Hoff 148c113fbe Merge pull request #2700 from matrix-org/rav/worker_docs 
* Improve documentation of workers

Fixes https://github.com/matrix-org/synapse/issues/2554
 2017-11-21 18:28:40 +00:00
Richard van der Hoff d5a7c56ef9 Merge pull request #2698 from matrix-org/rav/remove_dead_dependencies 
Clean up dependency list
 2017-11-21 17:38:42 +00:00
Richard van der Hoff 0b4aa2dc21 Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsert 
Avoid locking account_data tables for upserts
 2017-11-21 13:39:14 +00:00
Richard van der Hoff 59a7275258 Merge pull request #2688 from matrix-org/rav/unlock_more_upsert 
Avoid locking for upsert on pushers tables
 2017-11-17 13:09:31 +00:00
Richard van der Hoff 203058a027 Merge pull request #2679 from jkolo/fix_auth_handler 
Fix auth handler
 2017-11-16 17:09:00 +00:00
Richard van der Hoff ba05f28ae7 Merge pull request #2684 from matrix-org/rav/unlock_upsert 
Start work on avoiding table locks for upserts
 2017-11-16 16:27:29 +00:00
Richard van der Hoff f959c01600 Merge pull request #2661 from matrix-org/rav/statereadstore 
Pull out bits of StateStore to a mixin
 2017-11-15 17:23:01 +00:00
Richard van der Hoff 117a8c0d35 Merge pull request #2677 from matrix-org/rav/spec_r0.3.0 
Declare support for r0.3.0
 2017-11-15 17:10:45 +00:00
Richard van der Hoff 1b83c09c03 Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs 
Remove preserve_context_over_{fn, deferred}
 2017-11-15 11:13:53 +00:00
Richard van der Hoff 038c994724 Merge pull request #2648 from krombel/update_prometheus 
update prometheus-config to new format
 2017-11-14 19:14:32 +00:00
Richard van der Hoff 008aa2fc6d Merge pull request #2671 from matrix-org/rav/room_list_fixes 
Reshuffle room list request code
 2017-11-14 18:11:02 +00:00
Richard van der Hoff 6f30fd9235 Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups 
Add new boolean columns to port script
 2017-11-14 16:03:41 +00:00
Richard van der Hoff 6caa379ba1 Merge pull request #2658 from matrix-org/rav/store_heirarchy_init 
Make __init__ consistent across Store hierarchy
 2017-11-14 11:43:12 +00:00
Richard van der Hoff 7bd6c87eca Merge pull request #2668 from turt2live/travis/whoami 
Add a route for determining who you are
 2017-11-14 09:54:21 +00:00
Richard van der Hoff c741ba59c9 Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failure 
Cache failures in url_preview handler
 2017-11-13 18:36:24 +00:00
Richard van der Hoff 781c15a6a3 Merge pull request #2663 from matrix-org/rav/invalid_request_utf8 
Fix 500 on invalid utf-8 in request
 2017-11-13 18:35:24 +00:00