From 28d9c4beb0b49863d3e968c0703c2bfb9b5de801 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Feb 2019 15:01:00 -0700
Subject: [PATCH] Only use datastores which are enabled for uploads
---
.../matrix-media-repo/storage/datastore/datastore.go | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go b/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
index 1ce42c95..516ce1ad 100644
--- a/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
+++ b/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
@@ -34,16 +34,6 @@ func GetUriForDatastore(dsConf config.DatastoreConfig) string {
return ""
}
-func GetDatastoreConfig(ds *types.Datastore) (config.DatastoreConfig, error) {
- for _, dsConf := range config.Get().DataStores {
- if dsConf.Type == ds.Type && GetUriForDatastore(dsConf) == ds.Uri {
- return dsConf, nil
- }
- }
-
- return config.DatastoreConfig{}, errors.New("datastore not found")
-}
-
func PickDatastore(ctx context.Context, log *logrus.Entry) (*DatastoreRef, error) {
// Legacy options first
storagePaths := config.Get().Uploads.StoragePaths
@@ -110,7 +100,7 @@ func PickDatastore(ctx context.Context, log *logrus.Entry) (*DatastoreRef, error
var targetDsConf config.DatastoreConfig
var dsSize int64
for _, dsConf := range confDatastores {
- if !dsConf.Enabled {
+ if !dsConf.Enabled || !dsConf.ForUploads {
continue
}
--
GitLab