1
0
Commit Graph

6537 Commits

Author SHA1 Message Date
Erik Johnston
025458363f Remove unneeded timing log lines 2016-06-01 17:33:55 +01:00
Erik Johnston
40c5fffba1 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings 2016-06-01 16:46:46 +01:00
Erik Johnston
52e6bdecb4 Remove unnecessary sets 2016-06-01 15:45:37 +01:00
Erik Johnston
f4407484aa Merge branch 'erikj/state_users_in_room' of github.com:matrix-org/synapse into erikj/timings 2016-06-01 15:37:04 +01:00
David Baker
00c487a8db Merge pull request #808 from matrix-org/dbkr/room_list_spider
Add secondary_directory_servers option to fetch room list from other servers
2016-06-01 15:32:52 +01:00
Erik Johnston
c8285564a3 Use state to calculate get_users_in_room 2016-06-01 15:25:25 +01:00
Erik Johnston
9cd40a2f8d Load push rules in storage layer, so that they get cached 2016-06-01 14:27:07 +01:00
David Baker
1db79d6192 Merge pull request #810 from matrix-org/dbkr/limit_email_notifs
Limit number of notifications in an email notification
2016-06-01 12:49:22 +01:00
David Baker
d60eed0710 Limit number of notifications in an email notification 2016-06-01 11:45:43 +01:00
Erik Johnston
6e5fb82bc3 Only get local users 2016-06-01 11:34:06 +01:00
Erik Johnston
aa54bbe250 Up max_etnries 2016-06-01 11:23:48 +01:00
Erik Johnston
1b4fc178aa Up max_etnries 2016-06-01 11:20:11 +01:00
David Baker
195254cae8 Inject fake room list handler in tests
Otherwise it tries to start the remote public room list updating looping call which breaks.
2016-06-01 11:14:16 +01:00
Erik Johnston
0417a8607b Use state to calculate get_users_in_room 2016-06-01 11:13:08 +01:00
Erik Johnston
143ff10212 Merge branch 'erikj/cache_receipts_in_room' of github.com:matrix-org/synapse into erikj/timings 2016-06-01 11:08:45 +01:00
Erik Johnston
43db0d9f6a Add get_users_with_read_receipts_in_room cache 2016-06-01 10:54:32 +01:00
Erik Johnston
7b4f8c527c Add get_users_with_read_receipts_in_room cache 2016-06-01 10:33:39 +01:00
David Baker
8e539f13c0 Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider 2016-06-01 09:54:36 +01:00
David Baker
6ecb2ca4ec pep8 2016-06-01 09:48:55 +01:00
Matthew Hodgson
58ee43d020 handle emotes & notices correctly in email notifs 2016-05-31 20:28:42 +01:00
David Baker
2a449fec4d Add cache to remote room lists
Poll for updates from remote servers, waiting for the poll if there's no cache entry.
2016-05-31 18:27:23 +01:00
David Baker
6ca4d3ae9a Add vector.im to default secondary_directory_servers and add comment explaining it's not a permanent solution 2016-05-31 17:24:50 +01:00
Erik Johnston
219923eaad Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings 2016-05-31 17:24:42 +01:00
Erik Johnston
dea9f20f8c Force boolean 2016-05-31 17:24:30 +01:00
David Baker
963e3ed282 Apparently I am not permitted to have two blank lines here 2016-05-31 17:22:53 +01:00
David Baker
d240796ded Basic, un-cached support for secondary_directory_servers 2016-05-31 17:20:07 +01:00
Mark Haines
c8c5bf950a Fix synapse/storage/schema/delta/30/as_users.py 2016-05-31 17:10:40 +01:00
Erik Johnston
c9ca285d33 Merge pull request #805 from matrix-org/erikj/push_rules_cache
Fix GET /push_rules
2016-05-31 16:42:21 +01:00
Erik Johnston
fd3108fda6 Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings 2016-05-31 15:46:24 +01:00
Erik Johnston
1d4ee854e2 Fix typo 2016-05-31 15:45:53 +01:00
Erik Johnston
09970a70e1 Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings 2016-05-31 15:44:37 +01:00
Erik Johnston
cca0093fa9 Change fix 2016-05-31 15:44:08 +01:00
Erik Johnston
892a15190a Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings 2016-05-31 15:38:12 +01:00
Erik Johnston
4efa389299 Fix GET /push_rules 2016-05-31 15:37:53 +01:00
Erik Johnston
80c4c93db3 Merge branch 'erikj/hash_cache' of github.com:matrix-org/synapse into erikj/timings 2016-05-31 15:32:54 +01:00
Erik Johnston
aefd2d1cbc Cache get_event_reference_hashes 2016-05-31 15:32:32 +01:00
Erik Johnston
10de8c2631 Merge pull request #804 from matrix-org/erikj/push_rules_cache
Add caches to bulk_get_push_rules*
2016-05-31 15:04:40 +01:00
Mark Haines
014e0799f9 Merge pull request #803 from matrix-org/markjh/liberate_appservice_handler
Move the AS handler out of the Handlers object.
2016-05-31 14:31:19 +01:00
Mark Haines
c626fc576a Move the AS handler out of the Handlers object.
Access it directly from the homeserver itself. It already wasn't
inheriting from BaseHandler storing it on the Handlers object was
already somewhat dubious.
2016-05-31 13:53:48 +01:00
Erik Johnston
e77498c8aa Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings 2016-05-31 13:50:19 +01:00
Erik Johnston
e5b0bbcd33 Add caches to bulk_get_push_rules* 2016-05-31 13:46:58 +01:00
Erik Johnston
15f41e6084 Time _get_rules 2016-05-31 13:09:09 +01:00
Erik Johnston
05f2c86891 Time evaluator_for_event 2016-05-31 13:03:48 +01:00
Erik Johnston
d375e0038e Log duration of action generator 2016-05-31 12:01:38 +01:00
David Baker
70ecb415f5 Fix c+p fail 2016-05-31 12:00:54 +01:00
David Baker
e1625d62a8 Add federation room list servlet 2016-05-31 11:55:57 +01:00
Erik Johnston
49fda0f1de Add some crude measurement log lines 2016-05-31 11:49:13 +01:00
David Baker
163e48c0e3 Merge pull request #802 from matrix-org/dbkr/split_room_list_handler
Split out the room list handler
2016-05-31 11:32:44 +01:00
David Baker
887c6e6f05 Split out the room list handler
So I can use it from federation bits without pulling in all the handlers.
2016-05-31 11:05:16 +01:00
Erik Johnston
85b992f621 Fix to allow start with postgres 2016-05-27 10:44:44 +01:00