kaslo/synapse
1
0
Fork 0
Code Wiki Activity
15,032 Commits 1,047 Branches 805 Tags
745f2da4b8d90efbfe1cd813936816052d6c9a47
Commit Graph

15032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnston
745f2da4b8 Merge pull request #5946 from matrix-org/rei/rss_inc8 
Separated Statistics [8/7ish EOF]
 2019-09-02 13:04:54 +01:00
Erik Johnston
02f759e0a2 Renamve get_room_state 2019-09-02 11:33:03 +01:00
Erik Johnston
84532a4009 Merge branch 'rei/rss_target' of github.com:matrix-org/synapse into rei/rss_inc8 2019-09-02 10:27:39 +01:00
reivilibre
e8932145ab Merge pull request #5941 from matrix-org/rei/rss_inc7 
Separated Statistics [7/7ish]
 2019-08-30 17:37:24 +01:00
Olivier Wilkinson (reivilibre)
ffc30b8f60 Merge branch 'develop' into rei/rss_target 2019-08-30 17:32:09 +01:00
Andrew Morgan
2a012e8a04 Revert "Add m.id_access_token flag (#5930)" (#5945) 
This reverts commit 4765f0cfd9.
 2019-08-30 17:13:37 +01:00
Olivier Wilkinson (reivilibre)
fca3a9c121 Fix to use milliseconds 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 17:01:24 +01:00
Olivier Wilkinson (reivilibre)
21593febc3 Linting 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 16:32:20 +01:00
Andrew Morgan
4548d1f87e Remove unnecessary parentheses around return statements (#5931) 
Python will return a tuple whether there are parentheses around the returned values or not.

I'm just sick of my editor complaining about this all over the place :)
 2019-08-30 16:28:26 +01:00
Olivier Wilkinson (reivilibre)
fc5d1182b6 Add stats docs 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 16:27:00 +01:00
Olivier Wilkinson (reivilibre)
d49457b941 Add stats tests 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 16:26:54 +01:00
Olivier Wilkinson (reivilibre)
6f5e543901 Various fixes 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 16:26:40 +01:00
Amber Brown
4fca313389 Move buildkite config to the pipelines repo (#5943) 2019-08-31 01:01:57 +10:00
Olivier Wilkinson (reivilibre)
7b977bdf55 Fixes to counting and stats deltas 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:58:07 +01:00
Olivier Wilkinson (reivilibre)
ab11c0a293 Whoopsies; these things come in order… 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:39:57 +01:00
Olivier Wilkinson (reivilibre)
b928909795 Fix incremental processor when there are no deltas. 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:36:49 +01:00
Olivier Wilkinson (reivilibre)
98a8928fb5 Merge branch 'rei/rss_inc7' into rei/rss_inc8 2019-08-30 15:25:38 +01:00
Olivier Wilkinson (reivilibre)
50c321d8f3 Adapt to use renamed room_state 
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
 2019-08-30 15:25:33 +01:00
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
Andrew Morgan
4765f0cfd9 Add m.id_access_token flag (#5930) 
Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043

Fixes #5927
 2019-08-30 15:22:51 +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
Amber Brown
d19505a8c1 Removed unused jenkins/ folder and script (#5938) 2019-08-30 23:13:16 +10:00
Andrew Morgan
3057095a5d Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) 
This reverts commit 71fc04069a.

This broke 3PID invites as #5892 was required for it to work correctly.
 2019-08-30 12:00:20 +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