baf9e74a73
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-11-22 10:31:48 +00:00
f9834a3d1a
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse
2016-11-22 10:25:23 +00:00
aac06e8f74
Bump changelog
2016-11-22 10:24:04 +00:00
2bbc4cab60
Merge branch 'dbkr/work_around_devicename_bug' of github.com:matrix-org/synapse into release-v0.18.4
2016-11-22 10:18:30 +00:00
a28ec23273
Merge pull request #1636 from matrix-org/kegan/filter-error-msg
...
Fail with a coherent error message if `/sync?filter=` is invalid
2016-11-21 13:36:33 +00:00
a2a6c1c22f
Fail with a coherent error message if `/sync?filter=` is invalid
2016-11-21 13:15:25 +00:00
a289150943
Fix flake8
2016-11-18 17:15:02 +00:00
544722bad2
Work around client replacing reg params
...
Works around https://github.com/vector-im/vector-android/issues/715
and equivalent for iOS
2016-11-18 17:07:35 +00:00
dc6cede78e
Merge pull request #1628 from matrix-org/erikj/ldap_split_out
...
Use external ldap auth pacakge
2016-11-15 16:53:34 +00:00
c7546b3cdb
Merge pull request #1617 from matrix-org/erikj/intern_state_dict
...
Correctly intern keys in state cache
2016-11-15 16:45:55 +00:00
d56c39cf24
Use external ldap auth pacakge
2016-11-15 13:03:19 +00:00
f9d156d270
New Flake8 fixes
2016-11-15 11:22:29 +00:00
9d58ccc547
Bump changelog and version
2016-11-14 15:05:04 +00:00
9355a5c42b
Merge pull request #1624 from matrix-org/kegan/idempotent-requests
...
Store Promise<Response> instead of Response for HTTP API transactions
2016-11-14 12:45:30 +00:00
3991b4cbdb
Clean transactions based on time. Add HttpTransactionCache tests.
2016-11-14 11:19:24 +00:00
af4a1bac50
Move .observe() up to the cache to make things neater
2016-11-14 09:52:41 +00:00
0964005d84
Merge pull request #1625 from DanielDent/patch-1
...
Add support for durations in minutes
2016-11-12 11:20:46 +00:00
1c93cd9f9f
Add support for durations in minutes
2016-11-12 00:10:23 -08:00
8ecaff51a1
Review comments
2016-11-11 17:47:03 +00:00
f6c48802f5
More flake8
2016-11-11 15:08:24 +00:00
a88bc67f88
Flake8 and fix whoopsie
2016-11-11 15:02:29 +00:00
42c43cfafd
Use ObservableDeferreds instead of Deferreds as they behave as intended
2016-11-11 14:54:10 +00:00
c7daf3136c
Use observable deferreds because they are sane
2016-11-11 14:13:32 +00:00
8a8ad46f48
Flake8
2016-11-10 15:22:11 +00:00
2771447c29
Store Promise<Response> instead of Response for HTTP API transactions
...
This fixes a race whereby:
- User hits an endpoint.
- No cached transaction so executes main code.
- User hits same endpoint.
- No cache transaction so executes main code.
- Main code finishes executing and caches response and returns.
- Main code finishes executing and caches response and returns.
This race is common in the wild when Synapse is struggling under load.
This commit fixes the race by:
- User hits an endpoint.
- Caches the promise to execute the main code and executes main code.
- User hits same endpoint.
- Yields on the same promise as the first request.
- Main code finishes executing and returns, unblocking both requests.
2016-11-10 14:49:26 +00:00
6cc4fcf25c
Merge pull request #1619 from matrix-org/erikj/pwd_provider_error
...
Don't assume providers raise ConfigError's
2016-11-09 11:11:06 +00:00
ac507e7ab8
Don't assume providers raise ConfigError's
2016-11-08 17:23:28 +00:00
e6651e8046
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-11-08 14:43:49 +00:00
291628d42a
Merge branch 'erikj/ldap3_auth'
2016-11-08 14:40:54 +00:00
3c09818d91
Bump version and changelog
2016-11-08 14:39:55 +00:00
27d3f2e7ab
Explicitly set authentication mode in ldap3
...
This only makes a difference for versions of ldap3 before 1.0, but a)
its best to be explicit and b) there are distributions that package
ancient versions for ldap3 (e.g. debian).
2016-11-08 14:35:25 +00:00
17e0a58020
Merge pull request #1615 from matrix-org/erikj/limit_prev_events
...
Limit the number of prev_events of new events
2016-11-08 12:06:15 +00:00
587d8ac60f
Correctly intern keys in state cache
2016-11-08 11:53:25 +00:00
34449cfc6c
Merge pull request #1616 from matrix-org/erikj/worker_frozen_dict
...
Respect use_frozen_dicts option in workers
2016-11-08 11:32:22 +00:00
a4632783fb
Sample correctly
2016-11-08 11:20:26 +00:00
24772ba56e
Respect use_frozen_dicts option in workers
2016-11-08 11:07:18 +00:00
eeda4e618c
Limit the number of prev_events of new events
2016-11-08 11:02:29 +00:00
d24197bead
Merge pull request #1198 from euank/more-ip-blacklist
...
default config: blacklist more internal ips
2016-11-07 09:41:34 +00:00
c6bbad109b
default config: blacklist more internal ips
2016-11-06 17:02:25 -08:00
16dc9064d4
Merge pull request #1195 from matrix-org/erikj/incorrect_func
...
Remove unused but buggy function
2016-11-04 11:09:38 +00:00
63772443e6
Comment
2016-11-04 10:53:42 +00:00
a3f6576084
Remove unused but buggy function
2016-11-04 10:48:20 +00:00
7fc2b5c063
Merge pull request #1193 from matrix-org/paul/metrics
...
More updates to Promethese metrics exposition
2016-11-03 17:22:15 +00:00
89e3e39d52
Fix copypasto error in metric rename table in docs
2016-11-03 17:04:13 +00:00
2938a00825
Rename the python-specific metrics now the docs claim that we have done
2016-11-03 17:03:52 +00:00
5219f7e060
Since we don't export per-filetype fd counts any more, delete all the code related to that too
2016-11-03 16:41:32 +00:00
93ebeb2aa8
Remove now-unused 'resource' import
2016-11-03 16:37:09 +00:00
c1b077cd19
Now we have new-style metrics don't bother exporting legacy-named process ones
2016-11-03 16:34:16 +00:00
06cc0bb762
Merge pull request #1192 from matrix-org/erikj/postgres_gist
...
Replace postgres GIN with GIST
2016-11-03 15:15:43 +00:00
64c6566980
Remove spurious comment
2016-11-03 15:04:32 +00:00
Erik Johnston