Skip to content

Commit

Permalink
If collection or bucket is passed as None, log the client name property.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémy HUBSCHER committed May 10, 2017
1 parent 1f2d4da commit 51cf4f7
Showing 1 changed file with 24 additions and 19 deletions.
43 changes: 24 additions & 19 deletions kinto_http/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def create_bucket(self, bucket=None, data=None, permissions=None,
headers = DO_NOT_OVERWRITE if safe else None
endpoint = self.get_endpoint('bucket', bucket=bucket)

logger.info("Create bucket %r" % bucket)
logger.info("Create bucket %r" % bucket or self._bucket_name)

resp, _ = self.session.request('put', endpoint, data=data,
permissions=permissions,
Expand All @@ -228,7 +228,7 @@ def update_bucket(self, bucket=None, data=None, permissions=None,
endpoint = self.get_endpoint('bucket', bucket=bucket)
headers = self._get_cache_headers(safe, data, if_match)

logger.info("Update bucket %r" % bucket)
logger.info("Update bucket %r" % bucket or self._bucket_name)

resp, _ = self.session.request(method, endpoint, data=data,
permissions=permissions,
Expand All @@ -246,7 +246,7 @@ def get_buckets(self):
def get_bucket(self, bucket=None):
endpoint = self.get_endpoint('bucket', bucket=bucket)

logger.info("Get bucket %r" % bucket)
logger.info("Get bucket %r" % bucket or self._bucket_name)

try:
resp, _ = self.session.request('get', endpoint)
Expand All @@ -263,7 +263,7 @@ def delete_bucket(self, bucket=None, safe=True, if_match=None, if_exists=False):
endpoint = self.get_endpoint('bucket', bucket=bucket)
headers = self._get_cache_headers(safe, if_match=if_match)

logger.info("Delete bucket %r" % bucket)
logger.info("Delete bucket %r" % bucket or self._bucket_name)

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand Down Expand Up @@ -298,7 +298,7 @@ def create_group(self, group, bucket=None,
bucket=bucket,
group=group)

logger.info("Create group %r in bucket %r" % (group, bucket))
logger.info("Create group %r in bucket %r" % (group, bucket or self._bucket_name))

try:
resp, _ = self.session.request('put', endpoint, data=data,
Expand All @@ -322,7 +322,7 @@ def update_group(self, group, data=None, bucket=None,
group=group)
headers = self._get_cache_headers(safe, data, if_match)

logger.info("Update group %r in bucket %r" % (group, bucket))
logger.info("Update group %r in bucket %r" % (group, bucket or self._bucket_name))

resp, _ = self.session.request(method, endpoint, data=data,
permissions=permissions,
Expand All @@ -338,7 +338,7 @@ def get_group(self, group, bucket=None):
bucket=bucket,
group=group)

logger.info("Get group %r in bucket %r" % (group, bucket))
logger.info("Get group %r in bucket %r" % (group, bucket or self._bucket_name))

resp, _ = self.session.request('get', endpoint)
return resp
Expand All @@ -357,7 +357,7 @@ def delete_group(self, group, bucket=None,
group=group)
headers = self._get_cache_headers(safe, if_match=if_match)

logger.info("Delete group %r in bucket %r" % (group, bucket))
logger.info("Delete group %r in bucket %r" % (group, bucket or self._bucket_name))

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand All @@ -366,7 +366,7 @@ def delete_groups(self, bucket=None, safe=True, if_match=None):
endpoint = self.get_endpoint('groups', bucket=bucket)
headers = self._get_cache_headers(safe, if_match=if_match)

logger.info("Delete groups in bucket %r" % bucket)
logger.info("Delete groups in bucket %r" % bucket or self._bucket_name)

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand All @@ -392,7 +392,8 @@ def create_collection(self, collection=None, bucket=None,
bucket=bucket,
collection=collection)

logger.info("Create collection %r in bucket %r" % (collection, bucket))
logger.info("Create collection %r in bucket %r" %
(collection or self._collection_name, bucket or self._bucket_name))

try:
resp, _ = self.session.request('put', endpoint, data=data,
Expand All @@ -416,7 +417,8 @@ def update_collection(self, data=None, collection=None, bucket=None,
collection=collection)
headers = self._get_cache_headers(safe, data, if_match)

logger.info("Update collection %r in bucket %r" % (collection, bucket))
logger.info("Update collection %r in bucket %r" %
(collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request(method, endpoint, data=data,
permissions=permissions,
Expand All @@ -432,7 +434,8 @@ def get_collection(self, collection=None, bucket=None):
bucket=bucket,
collection=collection)

logger.info("Get collection %r in bucket %r" % (collection, bucket))
logger.info("Get collection %r in bucket %r" %
(collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request('get', endpoint)
return resp
Expand All @@ -450,7 +453,8 @@ def delete_collection(self, collection=None, bucket=None,
collection=collection)
headers = self._get_cache_headers(safe, if_match=if_match)

logger.info("Delete collection %r in bucket %r" % (collection, bucket))
logger.info("Delete collection %r in bucket %r" %
(collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand All @@ -459,7 +463,7 @@ def delete_collections(self, bucket=None, safe=True, if_match=None):
endpoint = self.get_endpoint('collections', bucket=bucket)
headers = self._get_cache_headers(safe, if_match=if_match)

logger.info("Delete collections in bucket %r" % bucket)
logger.info("Delete collections in bucket %r" % bucket or self._bucket_name)

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand Down Expand Up @@ -494,7 +498,7 @@ def get_record(self, id, collection=None, bucket=None):

logger.info(
"Get record with id %r from collection %r in bucket %r"
% (id, collection, bucket))
% (id, collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request('get', endpoint)
return resp
Expand All @@ -519,7 +523,7 @@ def create_record(self, data, id=None, collection=None, permissions=None,

logger.info(
"Create record with id %r in collection %r in bucket %r"
% (id, collection, bucket))
% (id, collection or self._collection_name, bucket or self._bucket_name))

try:
resp, _ = self.session.request('put', endpoint, data=data,
Expand Down Expand Up @@ -548,7 +552,7 @@ def update_record(self, data, id=None, collection=None, permissions=None,

logger.info(
"Update record with id %r in collection %r in bucket %r"
% (id, collection, bucket))
% (id, collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request(method, endpoint, data=data,
headers=headers,
Expand All @@ -575,7 +579,7 @@ def delete_record(self, id, collection=None, bucket=None,

logger.info(
"Delete record with id %r from collection %r in bucket %r"
% (id, collection, bucket))
% (id, collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand All @@ -587,7 +591,8 @@ def delete_records(self, collection=None, bucket=None,
collection=collection)
headers = self._get_cache_headers(safe, if_match=if_match)

logger.info("Delete records from collection %r in bucket %r" % (collection, bucket))
logger.info("Delete records from collection %r in bucket %r" %
(collection or self._collection_name, bucket or self._bucket_name))

resp, _ = self.session.request('delete', endpoint, headers=headers)
return resp['data']
Expand Down

0 comments on commit 51cf4f7

Please sign in to comment.