Skip to content

Commit

Permalink
Merge pull request #55 from RamanjaneyuluIdavalapati/master
Browse files Browse the repository at this point in the history
log id is resolved
  • Loading branch information
Ram Idavalapati authored Jun 16, 2018
2 parents 8f618dc + 7a2c419 commit 28d41ce
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ deploy:
- LICENSE
- kwikapi/api.py
- kwikapi/__init__.py
name: kwikapi-0.2.7
tag_name: 0.2.7
name: kwikapi-0.2.8
tag_name: 0.2.8
on:
repo: deep-compute/kwikapi
- provider: pypi
Expand Down
4 changes: 2 additions & 2 deletions kwikapi/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def _resolve_call_info(self, request):
namespace = namespace if namespace else None
r.namespace = namespace or ''

request.log = self.log.bind(__requestid=request._id,
request.log = self.log.bind(__requestid=request.id,
namespace=r.namespace,
function=fn_name,
apiid=self.api._id)
Expand Down Expand Up @@ -473,7 +473,7 @@ def handle_request(self, request):
method=rinfo.method, compute_time=tcompute, serialize_time=t.value,
deserialize_time=rinfo.time_deserialize,
__params=get_loggable_params(request.fn_params or {}),
protocol=request.protocol, type='metric')
protocol=request.protocol, type='log')

except Exception as e:
message = e.message if hasattr(e, 'message') else str(e)
Expand Down
2 changes: 1 addition & 1 deletion kwikapi/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def _prepare_request(self, post_body, get_params=None):
headers = {}
headers[PROTOCOL_HEADER] = self._protocol
if self._request:
headers[REQUEST_ID_HEADER] = self.request.id
headers[REQUEST_ID_HEADER] = self._request.id

upath = [self._version] + self._path
upath = '/'.join(x for x in upath if x)
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

version = '0.2.7'
version = '0.2.8'
setup(
name="kwikapi",
version=version,
Expand All @@ -22,8 +22,8 @@
],
extras_require={
'django': ['kwikapi-django==0.2.2'],
'tornado': ['kwikapi-tornado==0.2.3'],
'all': ['kwikapi-django==0.2.2', 'kwikapi-tornado==0.2.3']
'tornado': ['kwikapi-tornado==0.2.4'],
'all': ['kwikapi-django==0.2.2', 'kwikapi-tornado==0.2.4']
},
classifiers=[
'Environment :: Web Environment',
Expand Down

0 comments on commit 28d41ce

Please sign in to comment.