Revision b336e6fa snf-pithos-backend/pithos/backends/modular.py
| b/snf-pithos-backend/pithos/backends/modular.py | ||
|---|---|---|
| 39 | 39 |
import hashlib |
| 40 | 40 |
import binascii |
| 41 | 41 |
|
| 42 |
from kamaki.clients.quotaholder import QuotaholderClient
|
|
| 42 |
from synnefo.lib.quotaholder import QuotaholderClient
|
|
| 43 | 43 |
|
| 44 | 44 |
from base import DEFAULT_QUOTA, DEFAULT_VERSIONING, NotAllowedError, QuotaError, BaseBackend, \ |
| 45 | 45 |
AccountExists, ContainerExists, AccountNotEmpty, ContainerNotEmpty, ItemNotExists, VersionNotExists |
| ... | ... | |
| 145 | 145 |
def __init__(self, db_module=None, db_connection=None, |
| 146 | 146 |
block_module=None, block_path=None, block_umask=None, |
| 147 | 147 |
queue_module=None, queue_hosts=None, queue_exchange=None, |
| 148 |
quotaholder_enabled=True,
|
|
| 148 |
quotaholder_enabled=False,
|
|
| 149 | 149 |
quotaholder_url=None, quotaholder_token=None, |
| 150 |
quotaholder_client_poolsize=None, |
|
| 150 | 151 |
free_versioning=True, block_params=None): |
| 151 | 152 |
db_module = db_module or DEFAULT_DB_MODULE |
| 152 | 153 |
db_connection = db_connection or DEFAULT_DB_CONNECTION |
| ... | ... | |
| 209 | 210 |
self.queue = NoQueue() |
| 210 | 211 |
|
| 211 | 212 |
self.quotaholder_enabled = quotaholder_enabled |
| 212 |
self.quotaholder_url = quotaholder_url |
|
| 213 |
self.quotaholder_token = quotaholder_token |
|
| 214 |
self.quotaholder = QuotaholderClient(quotaholder_url, quotaholder_token) |
|
| 213 |
if quotaholder_enabled: |
|
| 214 |
self.quotaholder_url = quotaholder_url |
|
| 215 |
self.quotaholder_token = quotaholder_token |
|
| 216 |
self.quotaholder = QuotaholderClient( |
|
| 217 |
quotaholder_url, |
|
| 218 |
token=quotaholder_token, |
|
| 219 |
poolsize=quotaholder_client_poolsize) |
|
| 220 |
|
|
| 215 | 221 |
self.serials = [] |
| 216 | 222 |
self.messages = [] |
| 217 | 223 |
|
Also available in: Unified diff