Erik Johnston
|
42bc56dad3
|
Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson
|
2015-02-11 17:01:38 +00:00 |
|
Mark Haines
|
9c24cff6ef
|
Allow newer versions of syutil
|
2015-02-11 17:00:32 +00:00 |
|
Erik Johnston
|
7eef84a95b
|
pyflakes
|
2015-02-11 16:52:22 +00:00 |
|
Erik Johnston
|
76935078d1
|
Remove more debug logging
|
2015-02-11 16:51:22 +00:00 |
|
Erik Johnston
|
ed877d6585
|
Remove debug logging
|
2015-02-11 16:50:46 +00:00 |
|
Erik Johnston
|
ef276e8770
|
Fix so timing out connections to actually work.
|
2015-02-11 16:48:05 +00:00 |
|
Kegan Dougal
|
cb43fbeeb4
|
Fix tests which broke when event caching was introduced.
|
2015-02-11 16:46:01 +00:00 |
|
Kegan Dougal
|
f2fdcb7c4b
|
Merge branch 'develop' into application-services
|
2015-02-11 16:43:26 +00:00 |
|
Kegan Dougal
|
f518324426
|
Minor tweaks based on PR feedback.
|
2015-02-11 16:41:16 +00:00 |
|
Paul "LeoNerd" Evans
|
b164e0896c
|
Merge branch 'bugs/SYN-264' into develop
|
2015-02-11 16:23:30 +00:00 |
|
Paul "LeoNerd" Evans
|
7f47ba7383
|
Added another TODO note
|
2015-02-11 16:18:21 +00:00 |
|
Erik Johnston
|
41a9a76a99
|
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
|
2015-02-11 16:12:59 +00:00 |
|
Paul "LeoNerd" Evans
|
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 |
|
Paul "LeoNerd" Evans
|
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 |
|
Erik Johnston
|
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 |
|
Mark Haines
|
40f332e534
|
Merge pull request #65 from matrix-org/get_event_cache
Add an in-memory cache for get_event in the storage layer
|
2015-02-11 15:44:09 +00:00 |
|
Mark Haines
|
ddc25cf4e2
|
Invalidate the cache for an event if it is redacted
|
2015-02-11 15:23:28 +00:00 |
|
Mark Haines
|
aff892ce79
|
Fix formatting
|
2015-02-11 15:02:35 +00:00 |
|
Mark Haines
|
f5a70e0d2e
|
Add a cache for get_event
|
2015-02-11 15:01:15 +00:00 |
|
Mark Haines
|
d8324d5a2b
|
Add a lru cache class
|
2015-02-11 14:52:23 +00:00 |
|
Erik Johnston
|
4ebbaf0d43
|
Blunty replace json with simplejson
|
2015-02-11 14:23:10 +00:00 |
|
Erik Johnston
|
d4abeb8354
|
Mention new libs in CHANGES
|
2015-02-11 14:20:09 +00:00 |
|
Mark Haines
|
f42e29cf95
|
Merge pull request #63 from matrix-org/homeserver_test_setup
Factor out some of the common homeserver setup code
|
2015-02-11 11:46:08 +00:00 |
|
Mark Haines
|
896253e085
|
Factor out some of the common homeserver setup code into a
setup_test_homeserver function in utils.
|
2015-02-11 11:37:30 +00:00 |
|
Kegan Dougal
|
14d413752b
|
Fix newline on __init__
|
2015-02-11 10:53:47 +00:00 |
|
Kegan Dougal
|
fd40d992ad
|
PEP8-ify
|
2015-02-11 10:41:33 +00:00 |
|
Kegan Dougal
|
8beb613916
|
Add newline to EOF
|
2015-02-11 10:36:48 +00:00 |
|
Kegan Dougal
|
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 |
|
Erik Johnston
|
5758dafb4e
|
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
|
2015-02-11 10:35:13 +00:00 |
|
Erik Johnston
|
6370cffbbf
|
Fix bug where variable was not always defined
|
2015-02-11 10:34:41 +00:00 |
|
Erik Johnston
|
fb233dc40b
|
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
|
2015-02-11 10:33:19 +00:00 |
|
Erik Johnston
|
05b961d7e3
|
PEP8
|
2015-02-11 10:28:46 +00:00 |
|
Erik Johnston
|
dcf52469e8
|
Move time_bound_deferred into Clock
|
2015-02-11 10:25:06 +00:00 |
|
Erik Johnston
|
8c83cc471b
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-02-11 10:20:43 +00:00 |
|
Kegan Dougal
|
9978c5c103
|
Merge branch 'develop' into application-services
|
2015-02-11 10:03:24 +00:00 |
|
Mark Haines
|
ba63b4be5d
|
Merge pull request #60 from matrix-org/single_source_version_and_dependencies
Single source version and dependencies
|
2015-02-10 18:27:01 +00:00 |
|
Mark Haines
|
eab141ee67
|
Rename path to path_segments to make it clearer that it is a list
|
2015-02-10 18:25:54 +00:00 |
|
Erik Johnston
|
0e6b3e4e40
|
Time out HTTP federation requests
|
2015-02-10 18:17:27 +00:00 |
|
Mark Haines
|
5e54365234
|
Merge branch 'develop' into single_source_version_and_dependencies
|
2015-02-10 18:13:25 +00:00 |
|
Mark Haines
|
84a769cdb7
|
Fix code-style
|
2015-02-10 17:58:36 +00:00 |
|
Mark Haines
|
a9684730ac
|
Add the 'setup_requires' and allow easy_install since jenkins uses them
|
2015-02-10 17:48:16 +00:00 |
|
Mark Haines
|
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 |
|
Erik Johnston
|
eae0842bc1
|
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
|
2015-02-10 17:34:51 +00:00 |
|
Erik Johnston
|
c8e1da930d
|
Log all the exits from _attempt_new_transaction
|
2015-02-10 17:30:46 +00:00 |
|
Erik Johnston
|
771892b314
|
Merge pull request #59 from matrix-org/hotfixes-v0.6.1f
Hotfixes v0.6.1f
|
2015-02-10 16:39:05 +00:00 |
|
Erik Johnston
|
b61a308b27
|
Bump version
|
2015-02-10 16:37:12 +00:00 |
|
Erik Johnston
|
e8d4a31475
|
Fix prune_events to work with nested dicts
|
2015-02-10 16:36:51 +00:00 |
|
Mark Haines
|
b085fac735
|
Code-style fixes
|
2015-02-10 16:30:48 +00:00 |
|
Erik Johnston
|
093e34e301
|
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
|
2015-02-10 15:46:48 +00:00 |
|
Erik Johnston
|
697ab75a34
|
Sign auth_chains when returned by /state/ requests
|
2015-02-10 15:46:24 +00:00 |