Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow custom s3-equivalent storage service for blockstores and messages saving #452

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow custom s3-equivalent storage service for blockstores and messages saving #452

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810d929
allow custom s3-equivalent storage service
Jul 3, 2017
3a6bf7a
fix missing comma in argument list
Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions inbox/util/blockstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
STORE_MSG_ON_S3 = config.get('STORE_MESSAGES_ON_S3', None)

if STORE_MSG_ON_S3:
from boto.s3.connection import S3Connection
from boto.s3.connection import S3Connection, OrdinaryCallingFormat
from boto.s3.key import Key
else:
from inbox.util.file import mkdirp
Expand Down Expand Up @@ -56,8 +56,13 @@ def _save_to_s3_bucket(data_sha256, bucket_name, data):
start = time.time()

# Boto pools connections at the class level
conn = S3Connection(config.get('AWS_ACCESS_KEY_ID'),
config.get('AWS_SECRET_ACCESS_KEY'))
conn = S3Connection(host=config.get('CUSTOM_S3_HOST', None),
port=config.get('CUSTOM_S3_PORT', None),
is_secure=config.get('CUSTOM_S3_SSL', True),
aws_access_key_id=config.get('AWS_ACCESS_KEY_ID'),
aws_secret_access_key=config.get('AWS_SECRET_ACCESS_KEY'),
calling_format=OrdinaryCallingFormat())

bucket = conn.get_bucket(bucket_name, validate=False)

# See if it already exists; if so, don't recreate.
Expand Down Expand Up @@ -117,8 +122,13 @@ def _get_from_s3_bucket(data_sha256, bucket_name):
if not data_sha256:
return None

conn = S3Connection(config.get('AWS_ACCESS_KEY_ID'),
config.get('AWS_SECRET_ACCESS_KEY'))
conn = S3Connection(host=config.get('CUSTOM_S3_HOST', None),
port=config.get('CUSTOM_S3_PORT', None),
is_secure=config.get('CUSTOM_S3_SSL', True),
aws_access_key_id=config.get('AWS_ACCESS_KEY_ID'),
aws_secret_access_key=config.get('AWS_SECRET_ACCESS_KEY'),
calling_format=OrdinaryCallingFormat())

bucket = conn.get_bucket(bucket_name, validate=False)

key = bucket.get_key(data_sha256)
Expand Down