Skip to content

Commit

Permalink
Merge branch 'feature/fix-movecopy-status-codes' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@felliott
felliott committed Dec 12, 2017
2 parents bd753ab + c76a2b4 commit 3ec764a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions waterbutler/server/api/v1/provider/movecopy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ async def move_or_copy(self):
self.dest_meta = metadata

if created:
self.set_status(HTTPStatus.CREATED)
self.set_status(int(HTTPStatus.CREATED))
else:
self.set_status(HTTPStatus.OK)
self.set_status(int(HTTPStatus.OK))

self.write({'data': metadata.json_api_serialized(self.dest_resource)})

1 comment on commit 3ec764a

@cslzchen
Copy link
Contributor

@cslzchen cslzchen commented on 3ec764a Dec 12, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is the locally reproduced error message:

worker_1            | [2017-12-12 16:19:57,165: ERROR/ForkPoolWorker-2] Task website.archiver.tasks.make_copy_request[b71d0311-9695-46b6-a55e-81c838a9e901] raised unexpected: ConnectionError(ProtocolError('Connection aborted.', BadStatusLine('HTTP/1.1 HTTPStatus.CREATED Created\r\n',)),)
worker_1            | Traceback (most recent call last):
worker_1            |   File "/usr/local/lib/python2.7/site-packages/celery/app/trace.py", line 374, in trace_task
worker_1            |     R = retval = fun(*args, **kwargs)
worker_1            |   File "/usr/local/lib/python2.7/site-packages/celery/app/trace.py", line 629, in __protected_call__
worker_1            |     return self.run(*args, **kwargs)
worker_1            |   File "/code/framework/celery_tasks/utils.py", line 41, in wrapped
worker_1            |     res = func(*args, **kwargs)
worker_1            |   File "/code/website/archiver/tasks.py", line 163, in make_copy_request
worker_1            |     res = requests.post(url, data=json.dumps(data))
worker_1            |   File "/usr/local/lib/python2.7/site-packages/requests/api.py", line 99, in post
worker_1            |     return request('post', url, data=data, json=json, **kwargs)
worker_1            |   File "/usr/local/lib/python2.7/site-packages/requests/api.py", line 49, in request
worker_1            |     response = session.request(method=method, url=url, **kwargs)
worker_1            |   File "/usr/local/lib/python2.7/site-packages/requests/sessions.py", line 461, in request
worker_1            |     resp = self.send(prep, **send_kwargs)
worker_1            |   File "/usr/local/lib/python2.7/site-packages/raven/breadcrumbs.py", line 297, in send
worker_1            |     resp = real_send(self, request, *args, **kwargs)
worker_1            |   File "/usr/local/lib/python2.7/site-packages/requests/sessions.py", line 573, in send
worker_1            |     r = adapter.send(request, **kwargs)
worker_1            |   File "/usr/local/lib/python2.7/site-packages/requests/adapters.py", line 415, in send
worker_1            |     raise ConnectionError(err, request=request)
worker_1            | ConnectionError: ('Connection aborted.', BadStatusLine('HTTP/1.1 HTTPStatus.CREATED Created\r\n',))

Please sign in to comment.