Store GCS client on global level

Without this, every query to the GCS would have to re-establish a TCP/IP
connection and perform an OAuth handshake.
This commit is contained in:
Sybren A. Stüvel 2016-07-26 12:17:38 +02:00
parent d261b7b64c
commit 8d8f5068e1

View File

@ -6,11 +6,30 @@ import logging
from bson import ObjectId
from gcloud.storage.client import Client
from gcloud.exceptions import NotFound
from flask import current_app
from flask import current_app, g
from werkzeug.local import LocalProxy
log = logging.getLogger(__name__)
def get_client():
"""Stores the GCS client on the global Flask object.
The GCS client is not user-specific anyway.
"""
_gcs = getattr(g, '_gcs_client', None)
if _gcs is None:
_gcs = g._gcs_client = Client()
return _gcs
# This hides the specifics of how/where we store the GCS client,
# and allows the rest of the code to use 'gcs' as a simple variable
# that does the right thing.
gcs = LocalProxy(get_client)
class GoogleCloudStorageBucket(object):
"""Cloud Storage bucket interface. We create a bucket for every project. In
the bucket we create first level subdirs as follows:
@ -28,7 +47,6 @@ class GoogleCloudStorageBucket(object):
"""
def __init__(self, bucket_name, subdir='_/'):
gcs = Client()
try:
self.bucket = gcs.get_bucket(bucket_name)
except NotFound: