kaslo/synapse
1
0
Fork 0
Code Wiki Activity
15,011 Commits 1,047 Branches 805 Tags
eba432e54154c8a5a0eaab940449f2d02de92dda
Commit Graph

15011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Wilkinson (reivilibre)
eba432e541 Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 15:23:56 +01:00
Olivier Wilkinson (reivilibre)
d39c09c284 Ambiguous room_id 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:23:55 +01:00
Olivier Wilkinson (reivilibre)
97b20354fa Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 15:19:51 +01:00
Olivier Wilkinson (reivilibre)
4ecc62b0b6 Whoops, took out a line there... 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:19:50 +01:00
Olivier Wilkinson (reivilibre)
425d44521d Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 15:13:44 +01:00
Olivier Wilkinson (reivilibre)
b379a11dc2 users table's ID field is actually called name. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:13:41 +01:00
Olivier Wilkinson (reivilibre)
bf6d45f456 Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 15:11:14 +01:00
Olivier Wilkinson (reivilibre)
0f2e59f4f1 Fix that became apparent after unit testing 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:11:03 +01:00
Olivier Wilkinson (reivilibre)
7dc387e54c Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 15:08:44 +01:00
Olivier Wilkinson (reivilibre)
065042c325 Code formatting and typo pointed out by Erik. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:08:26 +01:00
Olivier Wilkinson (reivilibre)
440c60ef8f Some fixes that have become necessary due to changes in other PRs 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:05:57 +01:00
Olivier Wilkinson (reivilibre)
1d6cf15f6e Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 14:58:50 +01:00
reivilibre
8c0260299f Merge pull request #5924 from matrix-org/rei/rss_inc6 
Separated Statistics [6/7ish]
 2019-08-30 14:39:22 +01:00
Olivier Wilkinson (reivilibre)
893729a3a6 Code formatting 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 14:36:18 +01:00
Olivier Wilkinson (reivilibre)
44b036779e Add stats regenerator 2019-08-30 14:32:48 +01:00
Olivier Wilkinson (reivilibre)
757205d718 Convert chain to list as chain is only once iterable. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 14:26:02 +01:00
Olivier Wilkinson (reivilibre)
6c582d7ccb Merge branch 'rei/rss_target' into rei/rss_inc6 2019-08-30 11:21:40 +01:00
Olivier Wilkinson (reivilibre)
4c13f2b282 Merge branch 'develop' into rei/rss_target 2019-08-30 11:21:27 +01:00
reivilibre
9dbf42af8a Merge pull request #5923 from matrix-org/rei/rss_inc5 
Separated Statistics [5/7ish]
 2019-08-30 07:52:07 +01:00
Amber Brown
5625abe503 Fix buildkite pipeline plugin matrix-org/annotate using the wrong variable config 2019-08-30 15:06:40 +10:00
Olivier Wilkinson (reivilibre)
60481031f2 Merge branch 'rei/rss_target' into rei/rss_inc5 2019-08-29 15:02:09 +01:00
Olivier Wilkinson (reivilibre)
7c0224d5c0 Merge branch 'rei/rss_target' into rei/rss_inc6 2019-08-29 15:01:52 +01:00
Olivier Wilkinson (reivilibre)
f7ececb0ac Merge branch 'develop' into rei/rss_target 2019-08-29 15:01:27 +01:00
Olivier Wilkinson (reivilibre)
39dbee2a3e Count total_events and total_event_bytes within the loop. 
In this case, we still update these counts if we get stuck in the loop
because the server is busy.

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-29 14:10:21 +01:00
Amber Brown
e7011280c7 Fix coverage in sytest and use plugins for buildkite (#5922) 2019-08-29 22:19:57 +10:00
Olivier Wilkinson (reivilibre)
4444b9a1b3 Code formatting (Black) 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-29 08:08:41 +01:00
Olivier Wilkinson (reivilibre)
3b69bf3e74 Upsert fixes 2019-08-28 20:18:45 +01:00
Jorik Schellekens
92c1550f4a Add a link to python's logging config schema (#5926) 2019-08-28 19:08:32 +01:00
Will Hunt
c8fa620d7a Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent 
Exempt support users from consent
 2019-08-28 16:31:40 +01:00
Olivier Wilkinson (reivilibre)
73d552a05d Hoist up None check to prevent trying to iterate over NoneType.keys() 2019-08-28 16:14:00 +01:00
Jorik Schellekens
deca277d09 Let synctl use a config directory. (#5904) 
* Let synctl use a config directory.
 2019-08-28 15:55:58 +01:00
Olivier Wilkinson (reivilibre)
b06f2947e4 Track new users in user statistics. 
This makes the rows 'completed' so that the stats regenerator need not
touch them.
 2019-08-28 15:46:33 +01:00
Olivier Wilkinson (reivilibre)
d7a692f860 Update total_events and total_event_bytes on new events. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-28 14:57:03 +01:00
Olivier Wilkinson (reivilibre)
a13ad21abf Add incremental counting for rooms' total events and total event bytes. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-28 14:49:58 +01:00
Olivier Wilkinson (reivilibre)
bc2c284dbe Add total_event_bytes to room statistics schema. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-28 14:28:44 +01:00
Will Hunt
5798a134c0 Removing entry for 5903 2019-08-28 14:25:05 +01:00
Andrew Morgan
71fc04069a Use the v2 lookup API for 3PID invites (#5897) 
Fixes https://github.com/matrix-org/synapse/issues/5861

Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites.

Sytest PR: https://github.com/matrix-org/sytest/pull/679
 2019-08-28 14:59:26 +02:00
reivilibre
3cdce28d3b Merge pull request #5890 from matrix-org/rei/rss_inc3 
Separated Statistics [3/7ish]
 2019-08-28 13:31:14 +01:00
Jorik Schellekens
6d97843793 Config templating (#5900) 
Template config files

* Imagine a system composed entirely of x, y, z etc and the basic operations..

Wait George, why XOR? Why not just neq?

George: Eh, I didn't think of that..

Co-Authored-By: Erik Johnston <erik@matrix.org>
 2019-08-28 13:12:22 +01:00
Amber Brown
7dc398586c Implement a structured logging output system. (#5680) 2019-08-28 21:18:53 +10:00
Olivier Wilkinson (reivilibre)
81aa6d53b0 Address code review comments 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-28 10:54:22 +01:00
Richard van der Hoff
49ef8ec399 Fix a cache-invalidation bug for worker-based deployments (#5920) 
Some of the caches on worker processes were not being correctly invalidated
when a room's state was changed in a way that did not affect the membership
list of the room.

We need to make sure we send out cache invalidations even when no memberships
are changing.
 2019-08-28 10:18:16 +01:00
Olivier Wilkinson (reivilibre)
dfb22fec48 Merge branch 'rei/rss_target' into rei/rss_inc3 2019-08-28 09:53:33 +01:00
reivilibre
cc66cf1238 Merge pull request #5889 from matrix-org/rei/rss_inc2 
Separated Statistics [2/7ish]
 2019-08-28 09:49:38 +01:00
reivilibre
a3f0635686 Merge pull request #5914 from matrix-org/rei/admin_getadmin 
Add GET method to admin API /users/@user:dom/admin
 2019-08-28 09:44:22 +01:00
Victor Goff
1196ee32b3 Typographical corrections in docker/README (#5921) 2019-08-28 09:34:49 +01:00
Olivier Wilkinson (reivilibre)
a344ad3d3f Code formatting (Black) 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-28 09:33:03 +01:00
reivilibre
b9f1adc370 Update synapse/storage/stats.py 
Co-Authored-By: Erik Johnston <erik@matrix.org>
 2019-08-28 09:01:25 +01:00
reivilibre
7ccc251415 Merge pull request #5859 from matrix-org/rei/msc2197 
MSC2197 Search Filters over Federation
 2019-08-28 09:00:21 +01:00
Erik Johnston
dfd10f5133 Merge pull request #5864 from matrix-org/erikj/reliable_lookups 
Refactor MatrixFederationAgent to retry SRV.
 2019-08-27 16:54:06 +01:00