Revision f4fbb0fa snf-pithos-backend/pithos/backends/modular.py
b/snf-pithos-backend/pithos/backends/modular.py | ||
---|---|---|
79 | 79 |
DEFAULT_BLOCK_PATH = 'data/' |
80 | 80 |
DEFAULT_BLOCK_UMASK = 0o022 |
81 | 81 |
#DEFAULT_QUEUE_MODULE = 'pithos.backends.lib.rabbitmq' |
82 |
#DEFAULT_QUEUE_CONNECTION = 'rabbitmq://guest:guest@localhost:5672/pithos' |
|
82 |
#DEFAULT_QUEUE_HOSTS = '[amqp://guest:guest@localhost:5672]' |
|
83 |
#DEFAULT_QUEUE_EXCHANGE = 'pithos' |
|
83 | 84 |
|
84 | 85 |
QUEUE_MESSAGE_KEY_PREFIX = 'pithos.%s' |
85 | 86 |
QUEUE_CLIENT_ID = 'pithos' |
... | ... | |
127 | 128 |
|
128 | 129 |
def __init__(self, db_module=None, db_connection=None, |
129 | 130 |
block_module=None, block_path=None, block_umask=None, |
130 |
queue_module=None, queue_connection=None): |
|
131 |
queue_module=None, queue_hosts=None, |
|
132 |
queue_exchange=None): |
|
131 | 133 |
db_module = db_module or DEFAULT_DB_MODULE |
132 | 134 |
db_connection = db_connection or DEFAULT_DB_CONNECTION |
133 | 135 |
block_module = block_module or DEFAULT_BLOCK_MODULE |
134 | 136 |
block_path = block_path or DEFAULT_BLOCK_PATH |
135 | 137 |
block_umask = block_umask or DEFAULT_BLOCK_UMASK |
136 | 138 |
#queue_module = queue_module or DEFAULT_QUEUE_MODULE |
137 |
#queue_connection = queue_connection or DEFAULT_QUEUE_CONNECTION |
|
138 |
|
|
139 |
#queue_hosts = queue_hosts or DEFAULT_QUEUE_HOSTS |
|
140 |
#queue_exchange = queue_exchange or DEFAULT_QUEUE_EXCHANGE |
|
141 |
|
|
139 | 142 |
self.hash_algorithm = 'sha256' |
140 | 143 |
self.block_size = 4 * 1024 * 1024 # 4MB |
141 | 144 |
|
... | ... | |
165 | 168 |
'umask': block_umask} |
166 | 169 |
self.store = self.block_module.Store(**params) |
167 | 170 |
|
168 |
if queue_module and queue_connection:
|
|
171 |
if queue_module and queue_hosts:
|
|
169 | 172 |
self.queue_module = load_module(queue_module) |
170 |
params = {'exchange': queue_connection, |
|
173 |
params = {'hosts': queue_hosts, |
|
174 |
'exchange': queue_exchange, |
|
171 | 175 |
'client_id': QUEUE_CLIENT_ID} |
172 | 176 |
self.queue = self.queue_module.Queue(**params) |
173 | 177 |
else: |
... | ... | |
1221 | 1225 |
details.update({'user': user}) |
1222 | 1226 |
logger.debug("_report_object_change: %s %s %s %s", user, |
1223 | 1227 |
account, path, details) |
1224 |
self.messages.append((QUEUE_MESSAGE_KEY_PREFIX % ( |
|
1225 |
'object',), account, QUEUE_INSTANCE_ID, 'object', path, details))
|
|
1228 |
self.messages.append((QUEUE_MESSAGE_KEY_PREFIX % ('object',),
|
|
1229 |
account, QUEUE_INSTANCE_ID, 'object', path, details))
|
|
1226 | 1230 |
|
1227 | 1231 |
def _report_sharing_change(self, user, account, path, details={}): |
1228 | 1232 |
logger.debug("_report_permissions_change: %s %s %s %s", |
1229 | 1233 |
user, account, path, details) |
1230 | 1234 |
details.update({'user': user}) |
1231 |
self.messages.append((QUEUE_MESSAGE_KEY_PREFIX % ('sharing',), account,
|
|
1232 |
QUEUE_INSTANCE_ID, 'sharing', path, details))
|
|
1235 |
self.messages.append((QUEUE_MESSAGE_KEY_PREFIX % ('sharing',), |
|
1236 |
account, QUEUE_INSTANCE_ID, 'sharing', path, details))
|
|
1233 | 1237 |
|
1234 | 1238 |
# Policy functions. |
1235 | 1239 |
|
Also available in: Unified diff