pass through unexpected errors (#287)

ferozco · web-flow · commit 7fda2ab17d3d · 2018-03-15T11:19:12.000-04:00
* pass through unexpected errors

* fix tests
diff --git a/pyls/rpc_manager.py b/pyls/rpc_manager.py
@@ -1,5 +1,6 @@
 # Copyright 2017 Palantir Technologies, Inc.
 import logging
+import traceback
 from uuid import uuid4
 
 from concurrent.futures import ThreadPoolExecutor, Future
@@ -118,7 +119,7 @@ def _handle_request(self, request):
             output = _make_response(request, error=e.error._data)
         except Exception as e:  # pylint: disable=broad-except
             log.exception('synchronous method handler exception for request: %s', request)
-            output = _make_response(request, error=JSONRPCServerError()._data)
+            output = _make_response(request, error={'code': JSONRPCServerError.CODE, 'message': traceback.format_exc()})
         else:
             if request._id in self._received_requests:
                 log.error('Received request %s with duplicate id', request.data)
@@ -147,10 +148,11 @@ def did_finish_callback(completed_future):
                     result = completed_future.result()
                 except JSONRPCDispatchException as e:
                     output = _make_response(request, error=e.error._data)
-                except Exception as e:  # pylint: disable=broad-except
-                    # TODO(forozco): add more descriptive error
+                except Exception:  # pylint: disable=broad-except
                     log.exception('asynchronous method handler exception for request: %s', request)
-                    output = _make_response(request, error=JSONRPCServerError()._data)
+                    output = _make_response(request, error={
+                        'code': JSONRPCServerError.CODE, 'message': traceback.format_exc()
+                    })
                 else:
                     output = _make_response(request, result=result)
                 finally:
diff --git a/test/test_rpc_manager.py b/test/test_rpc_manager.py
@@ -53,7 +53,10 @@ def wrapper():
         rpc_manager._sent_requests.values()[0].result(timeout=1)
     message_manager.write_message.assert_called_once()
     (sent_message, ), _ = message_manager.write_message.call_args
-    assert sent_message.data == JSONRPC20Response(_id=1, error=JSONRPCServerError()._data).data
+    data = sent_message.data
+    assert data['id'] == 1
+    assert data['error']['code'] == JSONRPCServerError.CODE
+    assert 'something bad happened' in data['error']['message']
 
 
 def test_handle_request_async_error(rpc_management):
