ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup message handling (#1700)

Browse Source
This commit is contained in:
Charles Gagnon
2022-09-16 20:29:06 -07:00
committed by GitHub
parent e763d2463d
commit 072b3c7c78
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageDispatcher.cs
View File

@@ -122,7 +122,7 @@ namespace Microsoft.SqlTools.Hosting.Protocol
this.requestHandlers.Add( this.requestHandlers.Add(
requestType.MethodName, requestType.MethodName,
(requestMessage, messageWriter) => async (requestMessage, messageWriter) =>
{ {
var requestContext = var requestContext =
new RequestContext<TResult>( new RequestContext<TResult>(
@@ -139,16 +139,16 @@ namespace Microsoft.SqlTools.Hosting.Protocol
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception($"{requestType.MethodName} : Error parsing message contents {requestMessage.Contents}", ex); throw new Exception($"Error parsing message contents {requestMessage.Contents}", ex);
} }
} }
return requestHandler(typedParams, requestContext); await requestHandler(typedParams, requestContext);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Error(ex); Logger.Error($"{requestType.MethodName} : {ex}");
return requestContext.SendError(ex.Message); await requestContext.SendError(ex.Message);
} }
}); });
} }
@@ -176,7 +176,7 @@ namespace Microsoft.SqlTools.Hosting.Protocol
this.eventHandlers.Add( this.eventHandlers.Add(
eventType.MethodName, eventType.MethodName,
(eventMessage, messageWriter) => async (eventMessage, messageWriter) =>
{ {
var eventContext = new EventContext(messageWriter); var eventContext = new EventContext(messageWriter);
TParams typedParams = default(TParams); TParams typedParams = default(TParams);
@@ -190,17 +190,16 @@ namespace Microsoft.SqlTools.Hosting.Protocol
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Write(TraceEventType.Verbose, ex.ToString()); throw new Exception($"Error parsing message contents {eventMessage.Contents}", ex);
} }
} }
await eventHandler(typedParams, eventContext);
} }
catch (Exception ex) catch (Exception ex)
{ {
// There's nothing on the client side to send an error back to so just log the error and move on // There's nothing on the client side to send an error back to so just log the error and move on
Logger.Error(ex); Logger.Error($"{eventType.MethodName} : {ex}");
} }
return eventHandler(typedParams, eventContext);
}); });
} }