Erik Johnston
|
af89456c3c
|
Update dependency links
|
2015-02-11 17:15:16 +00:00 |
|
Erik Johnston
|
c52e8d395b
|
Merge pull request #61 from matrix-org/timeout-federation-requests
Timeout federation requests
|
2015-02-11 17:10:33 +00:00 |
|
Erik Johnston
|
021d93db11
|
Merge pull request #62 from matrix-org/state-chache
State chache
|
2015-02-11 17:10:28 +00:00 |
|
Erik Johnston
|
a793a0b810
|
Bump syutil version
|
2015-02-11 17:02:52 +00:00 |
|
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 |
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
Erik Johnston
|
f8abbae99f
|
Remove unnecessary logging
|
2015-02-10 15:45:50 +00:00 |
|
Erik Johnston
|
794fe2ca45
|
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
|
2015-02-10 15:23:08 +00:00 |
|
Mark Haines
|
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 |
|
Mark Haines
|
fda4422bc9
|
Fix pyflakes
|
2015-02-10 14:54:07 +00:00 |
|
Mark Haines
|
d7c7efb691
|
Add performance counters for different stages of loading events
|
2015-02-10 14:50:53 +00:00 |
|
Erik Johnston
|
91f0e41153
|
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
|
2015-02-10 14:30:26 +00:00 |
|
Erik Johnston
|
f91345bdb5
|
yaml.load expects strings to be a yaml rather than file
|
2015-02-10 13:57:31 +00:00 |
|
Erik Johnston
|
30595b466f
|
Use yaml logging config format because it is much nicer
|
2015-02-10 13:50:33 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
2b042ad67f
|
Oops, we do want to defer.return regardless of whether we are caching or not
|
2015-02-10 11:03:16 +00:00 |
|
Erik Johnston
|
d19e2ed02f
|
Move construction of object within if block
|
2015-02-10 11:01:15 +00:00 |
|
Erik Johnston
|
b90d377af4
|
Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop
|
2015-02-10 10:33:35 +00:00 |
|