Commit graph

126 commits

Author SHA1 Message Date
Robert Swain 391a1be69f mediaapi/writers/download: Fix infinite loop reading response body 2017-05-09 20:56:20 +02:00
Robert Swain 8f9eb13f69 mediaapi/writers/upload: Do not overwrite fields from database
If the entry does not exist, this would set all but the origin and id to
nil.
2017-05-09 20:10:59 +02:00
Robert Swain 911b5dc170 mediaapi/writers/upload: Generate Content-Disposition if not set 2017-05-09 20:10:27 +02:00
Robert Swain 9d9b23e8e4 Merge branch 'master' into rob/media-upload 2017-05-09 19:50:17 +02:00
Robert Swain 7cf34af30b WIP: Refactoring 2017-05-09 19:49:39 +02:00
Kegsay e226d564ec Fix a race with sync server integration tests (#95) 2017-05-09 15:58:31 +01:00
Kegsay 42564e8ed6 Factor out creating/deleting/writing to kafka topics (#94) 2017-05-09 09:05:05 +01:00
Kegsay 801b9246ce Add basic sync server integration test (#91) 2017-05-05 17:59:45 +01:00
Mark Haines a56f609b74 Update gomatrixserverlib (#90) 2017-05-05 17:43:42 +01:00
Mark Haines 0309035aad Update gomatrixserverlib (#89) 2017-05-05 16:19:48 +01:00
Robert Swain a24b3e7810 mediaapi/writers/download: Obtaining a file from a remote server is supported 2017-04-28 17:15:26 +02:00
Robert Swain 52b8b9b8fe mediaapi/writers/download: Remove cruft 2017-04-28 17:15:00 +02:00
Robert Swain 90bac42edb mediaapi/writers/download: Only accept GET method 2017-04-28 17:14:16 +02:00
Robert Swain 10e843da58 mediaapi/routing: Remove OPTIONS handling from GET endpoint 2017-04-28 17:13:36 +02:00
Robert Swain 42a390f8fe mediaapi/routing: Make use of refactored request logging in util package 2017-04-28 16:24:30 +02:00
Robert Swain 5d4432218b vendor: Update github.com/matrix-org/util 2017-04-28 16:24:07 +02:00
Robert Swain f2437be52b mediaapi/routing: Correct comment on origin of duplicated code 2017-04-28 14:45:18 +02:00
Robert Swain 0a24e406af mediaapi/routing: Rename Fudge to downloadRequestHandler 2017-04-28 14:44:54 +02:00
Robert Swain 81706408bd mediaapi: Hack in /download from gotest code 2017-04-27 17:40:57 +02:00
Robert Swain c1e5974872 mediaapi/storage: Remove DEFAULT from content_disposition in schema
It isn't very effective at all as we will anyway write an empty string.
We can handle what to do about that in the query code paths.
2017-04-26 12:19:47 +02:00
Robert Swain d9ee22d043 mediaapi: Hack in SQL db storage and Erik's gotest file upload code
After this, upload in a usual case now works but the code surely needs
cleanup.
2017-04-26 12:11:22 +02:00
Robert Swain 4d1bff2f61 mediaapi: Initial commit for /upload HTTP infra 2017-04-24 18:31:44 +02:00
Robert Swain a1ce351d36 Merge pull request #75 from matrix-org/rob/common-logging
Improve logging configuration
2017-04-21 17:48:17 +02:00
Robert Swain 9b7defd375 common/log: Always log to stderr 2017-04-21 02:11:24 +02:00
Robert Swain 27beb8a2b3 common/log: Re-colorize terminal log output 2017-04-21 02:06:06 +02:00
Robert Swain 9b7bf8cba8 common/log: Add license header 2017-04-21 01:45:18 +02:00
Robert Swain b33ed93dd6 Merge branch 'master' into rob/common-logging 2017-04-21 01:43:36 +02:00
Matthew Hodgson 0391a790a6 Merge pull request #80 from matrix-org/rob/license-headers
Add Apache Version 2.0 license and headers to all golang files
2017-04-20 23:54:27 +01:00
Robert Swain d09a65abbe Add Apache Version 2.0 license and headers to all golang files 2017-04-21 00:40:52 +02:00
Robert Swain d03126c546 Merge pull request #79 from matrix-org/rob/consistent-naming
Improve naming consistency
2017-04-21 00:20:27 +02:00
Robert Swain 19c9a0c7a5 travis-test.sh: Fix import path of room server 2017-04-20 19:21:15 +02:00
Robert Swain e281fc4530 syncserver: Rename to syncapi 2017-04-20 19:21:15 +02:00
Robert Swain d8b98cec44 client-api-proxy: roomserver-integration-tests: Fix renamed references 2017-04-20 19:21:15 +02:00
Robert Swain 0939ae3686 Rename dendrite-syncserver to dendrite-sync-api-server 2017-04-20 19:21:15 +02:00
Robert Swain 209ba3f6a3 Rename dendrite-roomserver to dendrite-room-server 2017-04-20 19:21:15 +02:00
Robert Swain 2278848922 Rename dendrite-clientapi to dendrite-client-api-server 2017-04-20 19:21:15 +02:00
Kegan Dougal 2a264db85e Don't tightloop if currentPos is 0 2017-04-20 18:01:45 +01:00
Kegsay cb5081b332 Yank out clientapi config options to env vars for now (#77) 2017-04-20 17:15:34 +01:00
Kegsay 2fadb9e409 Make it possible to point Riot at Dendrite (#74) 2017-04-20 17:11:53 +01:00
Mark Haines 43d1e94e75 Rename dendrite-sync-server to dendrite-syncserver for consistency (#76) 2017-04-20 16:54:22 +01:00
Robert Swain be47984c43 common/log: Always output timestamps as UTC 2017-04-20 17:16:16 +02:00
Robert Swain f65e26bc2a cmd: Configure logging before any log messages 2017-04-20 16:28:15 +02:00
Robert Swain 254e61f727 common/log: Switch to RFC3339 format with nanoseconds and trailing zeros 2017-04-20 16:28:15 +02:00
Robert Swain e8d2d61cc2 cmd: common/log: Always configure logging
When LOG_DIR or so is not specified, just configure the formatter.
2017-04-20 16:27:48 +02:00
Robert Swain 8010083026 dendrite/common: Move logrus configuration to common 2017-04-20 16:27:44 +02:00
Kegsay db428174d2 tool: Add client-api-proxy (#73) 2017-04-20 14:00:34 +01:00
Kegsay fad7e9541b /sync: Handle missing state events and return events in the correct order (#72) 2017-04-20 11:18:26 +01:00
Kegsay 92a0325266 Implement incremental sync (#71)
This has the following known shortcomings:
 - It doesn't handle missing events not in the from/to range.
 - It doesn't order events in the timeline correctly.
 - It doesn't handle invited/left rooms at all.
 - There is no intelligent wakeup logic: events for Bob will wake up Alice's stream.
2017-04-19 16:04:01 +01:00
Kegsay f18d935134 Factor out syncRequest parsing to its own file (#70)
Also ensure every sync response has a `next_batch` token by forcing
it in the constructor, as previously timeouts would not have a token.
2017-04-18 10:32:32 +01:00
Kegsay 53ec4a255b Calculate the complete /sync response (#69) 2017-04-13 16:56:46 +01:00