649dc8a7e2
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 17:43:14 +00:00
2c29ed3e84
Use absolute path when loading delta sql files
2015-02-17 17:22:24 +00:00
1a989c436c
Bump schema version
2015-02-17 15:45:55 +00:00
676e8ee78a
Remove debug raise
2015-02-17 15:22:45 +00:00
08e70231c9
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 15:21:33 +00:00
0647e27a41
Remove unused import
2015-02-17 15:19:54 +00:00
fa6c93bd26
Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop
2015-02-17 15:18:17 +00:00
c02da58a9d
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 15:15:07 +00:00
472734a8cc
Consume errors in time_bound_deferred
2015-02-17 15:13:50 +00:00
4de93001bf
Make matrixfederationclient log more nicely
2015-02-17 15:12:06 +00:00
659ead082f
Format the response of transaction request in a nicer way
2015-02-17 15:11:44 +00:00
c82e26ad4b
Actually respond with JSON to incoming transaction
2015-02-17 13:24:13 +00:00
47281f8fa4
Change some debug logging to info
2015-02-17 13:14:11 +00:00
02bfa889de
Handle recieving failures in transactions
2015-02-17 13:13:14 +00:00
c2b1dbd84c
We do want to consumeError
2015-02-17 11:11:11 +00:00
72a4de2ce6
Use consumeErrors=True on all DeferredLists.
...
This is so that the DeferredLists actually consume the error instead of
propogating down the non-existent errback chain. This should reduce the
number of unhandled errors we are seeing.
2015-02-17 10:07:01 +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
Erik Johnston