b6771037a6
Make version_string conform to User-Agent and Server spec
2015-02-18 17:31:50 +00:00
5b753d472b
Bump matrix-angular-sdk version
2015-02-18 17:02:40 +00:00
1df8bad63e
pyflakes
2015-02-18 16:54:25 +00:00
5358966a87
Use git aware version string in User-Agent and Server headers
2015-02-18 16:52:04 +00:00
aa577df064
When computing git version run git commands in same dir as source files
2015-02-18 16:52:04 +00:00
d122e215ff
Generate a version string that includes git details if run from git checkout
2015-02-18 16:52:04 +00:00
a7925259a1
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
2015-02-18 13:57:55 +00:00
7d304ae11c
Merge pull request #80 from matrix-org/restrict-destinations
...
Restrict the destinations that synapse can talk to
2015-02-18 13:56:48 +00:00
446ef58992
Add errback to all deferreds in transaction_queue
2015-02-18 12:03:26 +00:00
cc3d3babb0
Remove unused import
2015-02-18 12:01:41 +00:00
6375bd3e33
SYN-282: Don't log tracebacks for client errors
2015-02-18 12:01:37 +00:00
2462aacd77
Restrict the destinations that synapse can talk to
2015-02-18 11:52:51 +00:00
b68e4a729f
Discard destination 'localhost'
2015-02-18 11:32:39 +00:00
47d3ff4cf8
Don't send failure to self
2015-02-18 11:30:37 +00:00
36e144091b
Remove spurious comma. Remove temp run_on_reactor
2015-02-18 11:25:20 +00:00
b17bd31da0
Temporarily add a run_on_reactor() call
2015-02-18 11:17:26 +00:00
5806d52423
Fix syntax
2015-02-18 11:01:37 +00:00
87e9aeb914
Move pynacl to the top of the depedency link list so that it is
...
installed before syutil
2015-02-18 11:00:13 +00:00
7e9d59f3b4
Don't convert DNSLookupError to a 4xx SynapseError
2015-02-18 10:58:13 +00:00
cedad8fbd6
Bump version
2015-02-18 10:54:34 +00:00
65ca713ff5
Add .__name__ after type(e)
2015-02-18 10:51:32 +00:00
5e24471469
Fix up ResponseNeverReceived to str
2015-02-18 10:50:10 +00:00
e482541e1d
Fix pyflakes
2015-02-18 10:44:22 +00:00
0db52d43fa
strings.join() expects iterable of strings
2015-02-18 10:41:46 +00:00
859fbd4423
s/self._clock/self.clock/
2015-02-18 10:39:14 +00:00
1be67eca8a
Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into develop
2015-02-18 10:34:40 +00:00
2635d4e634
Merge branch 'develop' of github.com:matrix-org/synapse into develop
2015-02-18 10:29:54 +00:00
fe672a04f7
Merge pull request #77 from matrix-org/failures
...
Failures
2015-02-18 10:29:29 +00:00
08f804208b
Merge pull request #79 from matrix-org/get_pdu_limiting
...
Get pdu limiting
2015-02-18 10:29:10 +00:00
ec847059f3
Rename _fail_fetch_pdu_cache to _get_pdu_cache
2015-02-18 10:14:10 +00:00
4fd176a41d
More docs
2015-02-18 10:11:24 +00:00
d77912ff44
Docs.
2015-02-18 10:09:54 +00:00
9371019133
Try to only back off if we think we failed to connect to the remote
2015-02-17 18:13:34 +00:00
649dc8a7e2
Merge branch 'develop' of github.com:matrix-org/synapse into failures
2015-02-17 17:43:14 +00:00
c8436b38a0
Only update destination_retry_timings if we have succeeded when retrying
2015-02-17 17:38:38 +00:00
f91263b1e0
Remove spurious self
2015-02-17 17:37:51 +00:00
1177245e86
Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop
2015-02-17 17:30:11 +00:00
20e3172f38
Merge pull request #75 from matrix-org/dont_write_bytecode
...
Don't write bytecode
2015-02-17 17:29:55 +00:00
58554fa658
Merge branch 'develop' of github.com:matrix-org/synapse into keyclient_retry_scheme
2015-02-17 17:26:46 +00:00
2c29ed3e84
Use absolute path when loading delta sql files
2015-02-17 17:22:24 +00:00
2b8f1a956c
Add per server retry limiting.
...
Factor out the pre destination retry logic from TransactionQueue so it
can be reused in both get_pdu and crypto.keyring
2015-02-17 17:20:56 +00:00
5025305fb2
Rate limit retries when fetching server keys.
2015-02-17 15:57:42 +00:00
1a989c436c
Bump schema version
2015-02-17 15:45:55 +00:00
964bb43fbe
Fix typo in function name
2015-02-17 15:44:41 +00:00
e7e20417ca
ExpiringCache: purge every 1/2 interval
2015-02-17 15:44:26 +00:00
8b919c00f3
Start the get_pdu cache
2015-02-17 15:44:01 +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
ea1d6c16cd
Don't write bytecode
2015-02-17 10:54:06 +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
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
8ce100c7b4
Convert directory paths to absolute paths before daemonizing
2015-02-09 18:30:00 +00:00
5c5f5c1f0e
Merge pull request #56 from matrix-org/room_initial_sync_perf
...
During room intial sync, only calculate current state once.
2015-02-09 18:09:30 +00:00
375eba6a18
Merge pull request #57 from matrix-org/transaction_counters
...
Transaction counters
2015-02-09 18:08:08 +00:00
0c4536da8f
Use the transaction 'desc' rather than 'name', increment the txn_ids in
...
txn names
2015-02-09 18:06:31 +00:00
347b497db0
Formatting
2015-02-09 17:57:09 +00:00
3a5ad7dbd5
Performance counters for database transaction names
2015-02-09 17:55:56 +00:00
d94f682a4c
During room intial sync, only calculate current state once.
2015-02-09 17:41:29 +00:00
8f616684a3
Need to use re.search if looking for matches not at the start of the string. Also comparisons with None should be 'is'.
2015-02-09 17:01:40 +00:00
0b725f5c4f
oops
2015-02-09 16:48:31 +00:00
bd2373277d
oops
2015-02-09 16:48:09 +00:00
a578251b48
only do word-boundary patches on bodies for now
2015-02-09 16:44:47 +00:00
53557fc532
Merge branch 'develop' into application-services
2015-02-09 15:20:56 +00:00
f7cac2f7b6
Fix bugs so lazy room joining works as intended.
2015-02-09 15:01:28 +00:00
76c5a5c2f6
Merge pull request #55 from matrix-org/profiling
...
Profiling
2015-02-09 15:01:26 +00:00
c4ee4ce93e
Fix typo
2015-02-09 15:00:37 +00:00
ef995e6946
Add looping_call to Clock
2015-02-09 14:47:59 +00:00
66fde49f07
Log database time every 10s and log as percentage
2015-02-09 14:45:15 +00:00
75656712e3
Time how long we're spending on the database thread
2015-02-09 14:22:52 +00:00
784d714a3f
Fix server default rule injection (downwards, not upwards!)
2015-02-09 14:17:52 +00:00
5a7dd05818
Modify auth.get_user_by_req for authing appservices directly.
...
Add logic to map the appservice token to the autogenned appservice user ID.
Add unit tests for all forms of get_user_by_req (user/appservice,
valid/bad/missing tokens)
2015-02-09 14:14:15 +00:00
24cc6979fb
Log when we receive a request, when we send a response and how long it took to process it.
2015-02-09 13:46:22 +00:00
ac3183caaa
Register a user account for the AS when the AS registers. Add 'sender' column to AS table.
2015-02-09 12:03:37 +00:00
ecb0f78063
glob *s should probably be non-greedy
2015-02-08 02:37:35 +00:00
c2afc2ad90
oops
2015-02-08 00:37:03 +00:00
8be07e0db4
kill off fnmatch in favour of word-boundary based push alerts (untested)
2015-02-08 00:34:34 +00:00
37b6b880ef
don't give up if we can't create default avatars during tests
2015-02-07 21:24:08 +00:00
582019f870
...and here's the actual impl. git fail.
2015-02-07 13:32:14 +00:00
e117bc3fc5
thou shalt specify a content-length
2015-02-07 12:56:21 +00:00
34c39398fa
i hate weakly typed languages
2015-02-07 12:55:13 +00:00
73a680b2a8
Add errcodes for appservice registrations.
2015-02-06 17:10:04 +00:00
af613824e4
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
2015-02-06 16:59:00 +00:00
5bf318e9a6
Bug fixes.
2015-02-06 16:52:22 +00:00
b4886264a3
Bugfix cache layer
2015-02-06 16:17:05 +00:00
c4e3029d55
Add cache layer to state group resolution
2015-02-06 16:08:13 +00:00
20db147ef3
SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room
2015-02-06 16:01:04 +00:00
55a186485c
SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room
2015-02-06 15:58:40 +00:00
cc0532a4bf
Explicitly list the RejectedReasons that we can prove
2015-02-06 15:16:26 +00:00
0cd66885e3
Move delta/v13.sql to delta/v12.sql
2015-02-06 14:38:04 +00:00
e890ce223c
Don't query auth if the only difference is events that were rejected due to auth.
2015-02-06 14:16:50 +00:00
c78b5fb1f1
Make seen_ids a set
2015-02-06 13:52:16 +00:00
Erik Johnston