a2b7102eea
Tweak integrity error recovery to work as intended
2016-08-04 20:38:08 -07:00
a5d7968b3e
Merge pull request #973 from matrix-org/erikj/xpath_fix
...
Change the way we summarize URLs
2016-08-04 16:37:25 +01:00
b5525c76d1
Typo
2016-08-04 16:10:08 +01:00
e97648c4e2
Test summarization
2016-08-04 16:09:09 +01:00
835ceeee76
Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error
...
Retry event persistence on IntegrityError
2016-08-04 15:40:03 +01:00
b3682df2ca
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix
2016-08-04 15:29:45 +01:00
8ad8490cff
Fix typo
2016-08-04 15:21:29 +01:00
59fa91fe88
Retry event persistence on IntegrityError
...
Due to a bug in the porting script some backfilled events were not
correctly persisted, causing irrecoverable IntegrityErrors on future
attempts to persist those events.
This commit adds a retry mechanism invoked upon IntegrityError,
where when retried the tables are purged for all references to the
events being persisted.
2016-08-04 15:02:15 +01:00
1b5436ad78
Merge pull request #979 from matrix-org/erikj/state_ids_api
...
Add /state_ids federation API
2016-08-04 14:38:59 +01:00
257c41cc2e
Fix typos.
2016-08-04 14:05:45 +01:00
b4e2290d89
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api
2016-08-04 14:04:35 +01:00
e3ee63578f
Tidy up get_events
2016-08-04 14:01:18 +01:00
ea0b767114
Merge pull request #982 from matrix-org/erikj/fix_port_script
...
Port script: Handle the fact that some tables have negative rowid rows
2016-08-04 13:09:43 +01:00
ab03912e94
Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_null
...
keys/query: Omit device displayname if null
2016-08-04 12:51:43 +01:00
1fc50712d6
Factor out more common code from the jenkins scripts ( #980 )
...
* Factor out more common code from the jenkins scripts
* Fix install_and_run path
* Poke jenkins
* Poke jenkins
2016-08-04 12:31:55 +01:00
7c7786d4e1
Allow upgrading from old port_from_sqlite3 format
2016-08-04 11:38:08 +01:00
b0a14bf53e
Handle the fact that some tables have negative rowid rows
2016-08-04 11:28:02 +01:00
f131cd9e53
keys/query: Omit device displayname if null
...
... which makes it more consistent with user displaynames.
2016-08-04 10:59:51 +01:00
edb33eb163
Rename fields to _ids
2016-08-03 17:19:15 +01:00
bcc9cda8ca
Fix copy + paste fails
2016-08-03 17:17:26 +01:00
05e3354047
Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devices
...
Include device name in /keys/query response
2016-08-03 17:11:27 +01:00
3364d96c6b
Merge pull request #977 from matrix-org/rav/return_all_devices
...
keys/query: return all users which were asked for
2016-08-03 17:10:41 +01:00
98385888b8
PEP8
2016-08-03 15:42:08 +01:00
68264d7404
Include device name in /keys/query response
...
Add an 'unsigned' section which includes the device display name.
2016-08-03 15:42:08 +01:00
91fa69e029
keys/query: return all users which were asked for
...
In the situation where all of a user's devices get deleted, we want to
indicate this to a client, so we want to return an empty dictionary, rather
than nothing at all.
2016-08-03 15:41:44 +01:00
4c56bedee3
Actually call get_room_state
2016-08-03 15:04:29 +01:00
520ee9bd2c
Fix syntax error
2016-08-03 15:03:15 +01:00
a60a2eaa02
Comment
2016-08-03 14:52:43 +01:00
e3a720217a
Add /state_ids federation API
...
The new API only returns the event_ids for the state, as most
requesters will already have the vast majority of the events already.
2016-08-03 14:47:37 +01:00
530bc862dc
Merge branch 'rav/null_default_device_displayname' into develop
2016-08-03 14:30:32 +01:00
a6f5cc65d9
PEP8
2016-08-03 14:30:06 +01:00
e555bc6551
Merge branch 'rav/refactor_device_query' into develop
2016-08-03 14:26:01 +01:00
a843868fe9
E2eKeysHandler: minor tweaks
...
PR feedback
2016-08-03 14:24:33 +01:00
f5da3bacb2
Merge pull request #975 from matrix-org/erikj/multi_event_persist
...
Ensure we only persist an event once at a time
2016-08-03 14:10:36 +01:00
97f072db74
Print status code in federation_client.py
2016-08-03 13:46:56 +01:00
80ad710217
Remove other bit of deduplication
2016-08-03 13:25:59 +01:00
4fec5e57be
Default device_display_name to null
...
It turns out that it's more useful to return a null device display name (and
let clients decide how to handle it: eg, falling back to device_id) than using
a constant string like "unknown device".
2016-08-03 11:53:00 +01:00
a8a32d2714
Ensure we only persist an event once at a time
2016-08-03 11:23:39 +01:00
921f17f938
Merge branch 'develop' into rav/refactor_device_query
2016-08-03 11:12:47 +01:00
9a2f296fa2
Factor out some of the code shared between the sytest scripts ( #974 )
...
* Factor out some of the code shared between the different sytest jenkins scripts
* Exclude jenkins from the MANIFEST
* Fix dendron build
* Missing new line
* Poke jenkins
* Export the PORT_BASE and PORT_COUNT
* Poke jenkins
2016-08-02 20:42:30 +01:00
58c9653c6b
Don't infer paragrahs from newlines
2016-08-02 18:50:24 +01:00
6b58ade2f0
Comment on why we clone
2016-08-02 18:41:22 +01:00
9e66c58ceb
Spelling.
2016-08-02 18:37:31 +01:00
f83f5fbce8
Make it actually compile
2016-08-02 18:32:42 +01:00
aecaec3e10
Change the way we summarize URLs
...
Using XPath is slow on some machines (for unknown reasons), so use a
different approach to get a list of text nodes.
Try to generate a summary that respect paragraph and then word
boundaries, adding ellipses when appropriate.
2016-08-02 18:25:53 +01:00
1efee2f52b
E2E keys: Make federation query share code with client query
...
Refactor the e2e query handler to separate out the local query, and then make
the federation handler use it.
2016-08-02 18:12:00 +01:00
06f812b95c
Merge pull request #971 from matrix-org/erikj/fed_state
...
Fix response cache
2016-08-02 17:07:32 +01:00
c9154b970c
Don't double wrap 200
2016-08-02 16:45:53 +01:00
b3d5c4ad9d
Fix response cache
2016-08-02 16:42:21 +01:00
7b0f6293f2
Merge pull request #940 from matrix-org/erikj/fed_state_cache
...
Cache federation state responses
2016-08-02 15:21:37 +01:00
Benjamin Saunders