24f00a6c33
Use _simple_select_many for _get_state_group_for_events
2016-02-10 12:57:50 +00:00
8e49892b21
Only calculate initial sync for 10 rooms at a time
...
This helps to ensure we don't completely starve other requests.
2016-02-10 11:42:07 +00:00
e557dc80b8
Merge pull request #566 from matrix-org/erikj/logcontext
...
Don't bother copying records on parent context
2016-02-10 11:41:45 +00:00
4eb8f9ca8a
Remove comment
2016-02-10 11:29:21 +00:00
f7ef5c1d57
Merge pull request #568 from matrix-org/erikj/unread_notif
...
Atomically persit push actions when we persist the event
2016-02-10 11:25:32 +00:00
00c9ad49df
s/parent_context/previous_context/
2016-02-10 11:25:19 +00:00
9777c5f49a
Set parent context on instansiation
2016-02-10 11:23:32 +00:00
0214745239
Rename functions
2016-02-10 11:09:56 +00:00
6ad9586c84
Merge pull request #565 from matrix-org/erikj/macaroon_config
...
Derive macaroon_secret_key from signing key.
2016-02-09 16:34:15 +00:00
7b0d846407
Atomically persit push actions when we persist the event
2016-02-09 16:19:15 +00:00
f28cc45183
Pass in current state to push action handler
2016-02-09 16:01:40 +00:00
78d6c1b5be
Change a log from debug to info
2016-02-09 14:44:12 +00:00
feb294d552
Remove dead code
2016-02-09 14:32:17 +00:00
70a8608749
Invalidate get_last_receipt_event_id_for_user cache
2016-02-09 14:27:29 +00:00
eff12e838c
Don't load all ephemeral state for a room on every sync
2016-02-09 13:55:59 +00:00
82631c5f94
Fix unit tests
2016-02-09 13:50:37 +00:00
9ac9b75bc4
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2016-02-09 12:58:10 +00:00
ebaa999f92
Revert "Reject additional path segments"
...
This reverts commit 1d19a5ec0f
2016-02-09 12:46:52 +00:00
6c558ee8bc
Measure some /sync related things
2016-02-09 11:31:42 +00:00
31a2b892d8
Revert to putting it around the entire block
2016-02-09 11:25:09 +00:00
9daa4e2a85
Don't create new logging context
2016-02-09 11:06:19 +00:00
3e2fcd67b2
Don't bother copying records on parent context
2016-02-09 10:50:31 +00:00
241b71852e
Fix bug in util.metrics.Measure
2016-02-09 10:28:13 +00:00
97294ef2fd
Create new context when measuring
2016-02-09 10:12:00 +00:00
549698b1e0
Don't measure across event stream call, as it lasts for a long time.
2016-02-09 09:37:09 +00:00
c486b7b41c
Change logcontext warns to debug
2016-02-09 09:20:38 +00:00
f078ecbc8f
Derive macaroon_secret_key from signing key.
...
Unfortunately, there are people that are running synapse without a
`macaroon_sercret_key` set. Mandating they set one is a good solution,
except that breaking auto upgrades is annoying.
2016-02-08 16:35:44 +00:00
2bb5f035af
Merge pull request #564 from matrix-org/erikj/logcontext
...
Fix up logcontexts
2016-02-08 15:16:16 +00:00
cca5c06679
Merge pull request #562 from matrix-org/erikj/push_metric
...
Add metrics to pushers
2016-02-08 14:57:40 +00:00
2c1fbea531
Fix up logcontexts
2016-02-08 14:26:45 +00:00
13e6262659
Add metrics to pushers
2016-02-08 14:26:45 +00:00
1d19a5ec0f
Reject additional path segments
2016-02-08 10:50:55 +00:00
79a1c0574b
Allocate guest user IDs numericcally
...
The current random IDs are ugly and confusing when presented in UIs.
This makes them prettier and easier to read.
Also, disable non-automated registration of numeric IDs so that we don't
need to worry so much about people carving out our automated address
space and us needing to keep retrying ID registration.
2016-02-05 11:22:30 +00:00
737c4223ef
Host /media/r0 as well as /media/v1
2016-02-05 10:47:46 +00:00
6a9f1209df
Error if macaroon key is missing from config
...
Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading.
2016-02-05 01:58:23 +00:00
34dda7cc7f
Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null
...
Omit keys rather then returning null in profile API
2016-02-04 15:39:12 +00:00
4d36e73230
Actually return something sensible
2016-02-03 16:35:00 +00:00
709e09e1c3
Remove old log line
2016-02-03 16:32:20 +00:00
aa4af94c69
We return dicts now.
2016-02-03 16:29:32 +00:00
b84d59c5f0
Add descriptions
2016-02-03 16:22:35 +00:00
33c71c3a4b
Preserve log context over when deferring to thread pool in media repo
2016-02-03 16:17:18 +00:00
c8e4d5de7f
Merge pull request #555 from matrix-org/erikj/logcontext
...
Allowing tagging log contexts
2016-02-03 15:20:00 +00:00
156cea5b45
No braces here
2016-02-03 15:04:51 +00:00
8450114098
Merge pull request #554 from matrix-org/erikj/event_push
...
Change event_push_actions_rm_tokens schema
2016-02-03 15:02:47 +00:00
24277fbb97
Don't return null if profile display name / avatar url isn't set: omit them instead
2016-02-03 14:59:19 +00:00
66bb255fcd
Merge pull request #556 from matrix-org/daniel/config
...
Rename config field to reflect yaml name
2016-02-03 14:55:54 +00:00
5054806ec1
Rename config field to reflect yaml name
2016-02-03 14:42:01 +00:00
d4f72a5bfb
Allowing tagging log contexts
2016-02-03 13:52:27 +00:00
f8aae79a72
Simplify get_rooms
2016-02-03 13:24:35 +00:00
9cd80a7b5c
PEP8
2016-02-03 11:52:57 +00:00
Erik Johnston