0194e71e99
Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limiting
2015-02-17 09:48:23 +00:00
baa5b9a975
Cache results of get_pdu.
2015-02-16 18:02:39 +00:00
2674aeb96a
Factor out ExpiringCache from StateHandler
2015-02-16 16:16:47 +00:00
91fc5eef1d
Mark old events as outliers.
...
This is to fix the issue where if a remote server sends an event
that references a really "old" event, then the local server will pull
that in and send to all clients.
We decide if an event is old if its depth is less than the minimum depth
of the room.
2015-02-16 14:27:40 +00:00
6138584651
Don't return anything from _handle_new_pdu, since we ignore the return value anyway
2015-02-16 14:08:02 +00:00
8a59915d7d
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
2015-02-16 09:47:22 +00:00
6dd5c95841
Bump version
2015-02-15 20:38:52 +00:00
b99a33f283
resolve_events expect lists, not dicts
2015-02-15 20:20:51 +00:00
5f68529036
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 16:21:30 +00:00
64def4f953
Merge branch 'hotfixes-0.7.0e' into develop
2015-02-13 16:18:34 +00:00
a78838c5ba
Bump version
2015-02-13 16:17:54 +00:00
8d5cce62ab
Update pushers by app id and pushkey, not user id and pushkey
2015-02-13 16:16:16 +00:00
650dc7f0f9
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 15:46:42 +00:00
be26697b29
Bump version
2015-02-13 15:37:35 +00:00
b11a6e1c3c
Fix wrong variable name
2015-02-13 15:37:18 +00:00
0d872f5aa6
Merge pull request #50 from matrix-org/application-services
...
Application Services
2015-02-13 15:06:14 +00:00
fa662b52d0
Merge pull request #72 from matrix-org/in_memory_sqlite_for_testing
...
Prepare the database whenever a connection is opened from the db_pool so...
2015-02-13 14:42:27 +00:00
183b3d4e47
Prepare the database whenever a connection is opened from the db_pool so that in-memory databases will work
2015-02-13 14:38:24 +00:00
0546126cc5
Bump version
2015-02-13 14:36:40 +00:00
e441c10a73
pyflakes
2015-02-13 14:23:39 +00:00
8c652a2b5f
When we see a difference in current state, actually use state conflict resolution algorithm
2015-02-13 14:20:05 +00:00
6375abcdac
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 13:34:25 +00:00
c09493d7aa
Bump version
2015-02-13 13:33:37 +00:00
74626a8de4
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-13 10:09:55 +00:00
55e0916ffc
Reindent code to be less human-readable to keep pep8 from complaining
2015-02-12 21:04:34 +00:00
f22646efcc
Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)
2015-02-12 21:01:29 +00:00
789251afa7
Fix logging
2015-02-12 19:29:43 +00:00
38df10b99e
Remove unused function
2015-02-12 19:29:32 +00:00
93d07c87dc
Reindent code to be less human-readable to keep pep8 from complaining
2015-02-12 19:19:37 +00:00
5f6e6530d0
Appease pyflakes
2015-02-12 19:15:23 +00:00
29805213d1
Can now remove the FIXME too
2015-02-12 19:13:21 +00:00
860b1b4841
Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)
2015-02-12 19:13:21 +00:00
58d848adc0
Parrellize fetching of events
2015-02-12 18:35:36 +00:00
963256638d
Correctly handle all the places that can throw exceptions
2015-02-12 18:17:11 +00:00
48fbe79f71
Bump version
2015-02-12 14:52:02 +00:00
6b186a57ba
Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a
2015-02-12 14:51:46 +00:00
717687e1fc
Get an auth query one at a time
2015-02-12 14:39:31 +00:00
a566ed2f0e
Bump webclient version
2015-02-12 10:49:07 +00:00
83d41f25d8
Set database schema version in delta
2015-02-12 10:05:47 +00:00
ff2a2ae56e
Bump version
2015-02-12 10:02:06 +00:00
8bbdf32849
Convert get_rooms to use runInteraction so the transacion has a more helpful description
2015-02-11 18:56:13 +00:00
2bf0e85f3d
Use encode_canonical_json for http client
2015-02-11 17:34:23 +00:00
e9e54449f5
Use encode_canonical_json for pushes
2015-02-11 17:32:42 +00:00
af89456c3c
Update dependency links
2015-02-11 17:15:16 +00:00
c52e8d395b
Merge pull request #61 from matrix-org/timeout-federation-requests
...
Timeout federation requests
2015-02-11 17:10:33 +00:00
021d93db11
Merge pull request #62 from matrix-org/state-chache
...
State chache
2015-02-11 17:10:28 +00:00
a793a0b810
Bump syutil version
2015-02-11 17:02:52 +00:00
42bc56dad3
Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson
2015-02-11 17:01:38 +00:00
9c24cff6ef
Allow newer versions of syutil
2015-02-11 17:00:32 +00:00
7eef84a95b
pyflakes
2015-02-11 16:52:22 +00:00
76935078d1
Remove more debug logging
2015-02-11 16:51:22 +00:00
ed877d6585
Remove debug logging
2015-02-11 16:50:46 +00:00
ef276e8770
Fix so timing out connections to actually work.
2015-02-11 16:48:05 +00:00
f2fdcb7c4b
Merge branch 'develop' into application-services
2015-02-11 16:43:26 +00:00
f518324426
Minor tweaks based on PR feedback.
2015-02-11 16:41:16 +00:00
b164e0896c
Merge branch 'bugs/SYN-264' into develop
2015-02-11 16:23:30 +00:00
7f47ba7383
Added another TODO note
2015-02-11 16:18:21 +00:00
41a9a76a99
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
2015-02-11 16:12:59 +00:00
45b56609ae
Cache the result of a get_rooms_for_user query, to make user_rooms_intersect() much lighter in the read-common case
2015-02-11 16:04:08 +00:00
7be0f6594e
First step of making user_rooms_intersect() faster - implement in intersection logic in Python code terms of a DB query that is cacheable per user
2015-02-11 15:53:56 +00:00
ddb816cf60
Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict
2015-02-11 15:44:28 +00:00
ddc25cf4e2
Invalidate the cache for an event if it is redacted
2015-02-11 15:23:28 +00:00
aff892ce79
Fix formatting
2015-02-11 15:02:35 +00:00
f5a70e0d2e
Add a cache for get_event
2015-02-11 15:01:15 +00:00
d8324d5a2b
Add a lru cache class
2015-02-11 14:52:23 +00:00
4ebbaf0d43
Blunty replace json with simplejson
2015-02-11 14:23:10 +00:00
14d413752b
Fix newline on __init__
2015-02-11 10:53:47 +00:00
fd40d992ad
PEP8-ify
2015-02-11 10:41:33 +00:00
8beb613916
Add newline to EOF
2015-02-11 10:36:48 +00:00
c7783d6fee
Notify ASes for events sent by other users in a room which an AS user is a part of.
2015-02-11 10:36:08 +00:00
5758dafb4e
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-11 10:35:13 +00:00
6370cffbbf
Fix bug where variable was not always defined
2015-02-11 10:34:41 +00:00
fb233dc40b
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
2015-02-11 10:33:19 +00:00
05b961d7e3
PEP8
2015-02-11 10:28:46 +00:00
dcf52469e8
Move time_bound_deferred into Clock
2015-02-11 10:25:06 +00:00
8c83cc471b
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-02-11 10:20:43 +00:00
9978c5c103
Merge branch 'develop' into application-services
2015-02-11 10:03:24 +00:00
0e6b3e4e40
Time out HTTP federation requests
2015-02-10 18:17:27 +00:00
5e54365234
Merge branch 'develop' into single_source_version_and_dependencies
2015-02-10 18:13:25 +00:00
84a769cdb7
Fix code-style
2015-02-10 17:58:36 +00:00
7ed971d9b2
Single source version and python dependencies, prevent people accidentally installing with easy_install, use scripts rather than entry_points to install synctl
2015-02-10 17:42:36 +00:00
eae0842bc1
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 17:34:51 +00:00
c8e1da930d
Log all the exits from _attempt_new_transaction
2015-02-10 17:30:46 +00:00
b61a308b27
Bump version
2015-02-10 16:37:12 +00:00
e8d4a31475
Fix prune_events to work with nested dicts
2015-02-10 16:36:51 +00:00
b085fac735
Code-style fixes
2015-02-10 16:30:48 +00:00
093e34e301
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 15:46:48 +00:00
697ab75a34
Sign auth_chains when returned by /state/ requests
2015-02-10 15:46:24 +00:00
f8abbae99f
Remove unnecessary logging
2015-02-10 15:45:50 +00:00
794fe2ca45
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 15:23:08 +00:00
f88d3ee8ae
Merge pull request #58 from matrix-org/get_event_counters
...
Add performance counters for different stages of loading events
2015-02-10 15:15:20 +00:00
fda4422bc9
Fix pyflakes
2015-02-10 14:54:07 +00:00
d7c7efb691
Add performance counters for different stages of loading events
2015-02-10 14:50:53 +00:00
91f0e41153
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-10 14:30:26 +00:00
f91345bdb5
yaml.load expects strings to be a yaml rather than file
2015-02-10 13:57:31 +00:00
30595b466f
Use yaml logging config format because it is much nicer
2015-02-10 13:50:33 +00:00
c86ebe7673
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
...
Conflicts:
synapse/app/homeserver.py
synapse/state.py
2015-02-10 11:04:37 +00:00
2b042ad67f
Oops, we do want to defer.return regardless of whether we are caching or not
2015-02-10 11:03:16 +00:00
d19e2ed02f
Move construction of object within if block
2015-02-10 11:01:15 +00:00
b90d377af4
Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop
2015-02-10 10:33:35 +00:00
Erik Johnston