From fa3d68c8c13138dfff9bde51bb3fec488ae03908 Mon Sep 17 00:00:00 2001 From: Will Ronchetti Date: Tue, 24 Mar 2020 14:23:40 -0400 Subject: [PATCH] C4-89 Always use S3BlobStorage (#138) * C4-89 always use S3BlobStorage * C4-89 up minor version * C4-89 use postgres if you really have to * C4-89 take Kents suggestion --- pyproject.toml | 2 +- snovault/storage.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c7163cd71..fe54fe0c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "2.0.3" +version = "2.0.4" description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" diff --git a/snovault/storage.py b/snovault/storage.py index 5d32bfa77..988a9deab 100644 --- a/snovault/storage.py +++ b/snovault/storage.py @@ -1,4 +1,3 @@ - from pyramid.httpexceptions import ( HTTPConflict, HTTPLocked, @@ -99,10 +98,10 @@ def register_storage(registry, write_override=None, read_override=None): _DBSESSION = registry[DBSESSION] # set up blob storage if not configured already - if not registry.get(BLOBS) and registry.settings.get('blob_bucket'): - registry[BLOBS] = S3BlobStorage(registry.settings['blob_bucket']) - else: - registry[BLOBS] = RDBBlobStorage(registry[DBSESSION]) + blob_bucket = registry.settings.get('blob_bucket', None) + registry[BLOBS] = (S3BlobStorage(blob_bucket) + if blob_bucket + else RDBBlobStorage(registry[DBSESSION])) Base = declarative_base()