mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-09 07:53:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

mediaapi/routing: Pass pointer to config struct instead of copying

Browse source
This commit is contained in:
Robert Swain 2017-05-17 13:29:35 +02:00
parent a821b9155f
commit 937162a722
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go
View file

@ -39,7 +39,7 @@ func main() {
log.Panic("No BIND_ADDRESS environment variable found.") log.Panic("No BIND_ADDRESS environment variable found.")
} }
cfg := config.MediaAPI{ cfg := &config.MediaAPI{
ServerName: "localhost", ServerName: "localhost",
BasePath: "/Users/robertsw/dendrite", BasePath: "/Users/robertsw/dendrite",
MaxFileSize: 10 * 1024 * 1024, MaxFileSize: 10 * 1024 * 1024,

2
src/github.com/matrix-org/dendrite/mediaapi/routing/routing.go
View file

@ -31,7 +31,7 @@ const pathPrefixR0 = "/_matrix/media/v1"
// Setup registers HTTP handlers with the given ServeMux. It also supplies the given http.Client // Setup registers HTTP handlers with the given ServeMux. It also supplies the given http.Client
// to clients which need to make outbound HTTP requests. // to clients which need to make outbound HTTP requests.
func Setup(servMux *http.ServeMux, httpClient *http.Client, cfg config.MediaAPI, db *storage.Database) { func Setup(servMux *http.ServeMux, httpClient *http.Client, cfg *config.MediaAPI, db *storage.Database) {
apiMux := mux.NewRouter() apiMux := mux.NewRouter()
r0mux := apiMux.PathPrefix(pathPrefixR0).Subrouter() r0mux := apiMux.PathPrefix(pathPrefixR0).Subrouter()
r0mux.Handle("/upload", make("upload", util.NewJSONRequestHandler(func(req *http.Request) util.JSONResponse { r0mux.Handle("/upload", make("upload", util.NewJSONRequestHandler(func(req *http.Request) util.JSONResponse {

2
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
View file

@ -89,7 +89,7 @@ var nTries = 5
// If they are present in the cache, they are served directly. // If they are present in the cache, they are served directly.
// If they are not present in the cache, they are obtained from the remote server and // If they are not present in the cache, they are obtained from the remote server and
// simultaneously served back to the client and written into the cache. // simultaneously served back to the client and written into the cache.
func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName, mediaID types.MediaID, cfg config.MediaAPI, db *storage.Database, activeRemoteRequests *types.ActiveRemoteRequests) { func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName, mediaID types.MediaID, cfg *config.MediaAPI, db *storage.Database, activeRemoteRequests *types.ActiveRemoteRequests) {
logger := util.GetLogger(req.Context()) logger := util.GetLogger(req.Context())
// request validation // request validation

2
src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go
View file

@ -100,7 +100,7 @@ type uploadResponse struct {
// This implementation supports a configurable maximum file size limit in bytes. If a user tries to upload more than this, they will receive an error that their upload is too large. // This implementation supports a configurable maximum file size limit in bytes. If a user tries to upload more than this, they will receive an error that their upload is too large.
// Uploaded files are processed piece-wise to avoid DoS attacks which would starve the server of memory. // Uploaded files are processed piece-wise to avoid DoS attacks which would starve the server of memory.
// TODO: Requests time out if they have not received any data within the configured timeout period. // TODO: Requests time out if they have not received any data within the configured timeout period.
func Upload(req *http.Request, cfg config.MediaAPI, db *storage.Database) util.JSONResponse { func Upload(req *http.Request, cfg *config.MediaAPI, db *storage.Database) util.JSONResponse {
logger := util.GetLogger(req.Context()) logger := util.GetLogger(req.Context())
if req.Method != "POST" { if req.Method != "POST" {