ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix drop object issue and add logging (#1974)

Browse Source 
* fix drop object issue

* remove content logging

* remove ununsed using.
This commit is contained in:
Alan Ren
2023-03-28 19:55:37 -07:00
committed by GitHub
parent 45f1d0db22
commit 3ddbf729ce
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,29 +159,32 @@ namespace Microsoft.SqlTools.Hosting.Protocol
} }
catch (Exception ex) catch (Exception ex)
{ {
string errorMessage = GetErrorMessage(ex); Logger.Error($"{requestType.MethodName} : {GetErrorMessage(ex, true)}");
Logger.Error($"{requestType.MethodName} : {errorMessage}"); await requestContext.SendError(GetErrorMessage(ex));
await requestContext.SendError(errorMessage);
} }
}); });
} }
private string GetErrorMessage(Exception e) private string GetErrorMessage(Exception e, bool includeStackTrace = false)
{ {
List<string> errors = new List<string>(); List<string> errors = new List<string>();
while (e != null) while (e != null)
{ {
errors.Add(e.Message); errors.Add(e.Message);
if (includeStackTrace)
{
errors.Add(e.StackTrace);
}
e = e.InnerException; e = e.InnerException;
} }
return errors.Count > 0 ? string.Join(" ---> ", errors) : string.Empty; return errors.Count > 0 ? string.Join(includeStackTrace ? Environment.NewLine : " ---> ", errors) : string.Empty;
} }
public void SetEventHandler<TParams>( public void SetEventHandler<TParams>(
EventType<TParams> eventType, EventType<TParams> eventType,
Func<TParams, EventContext, Task> eventHandler) Func<TParams, EventContext, Task> eventHandler)
{ {
this.SetEventHandler( this.SetEventHandler(
eventType, eventType,

2
src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectManagementService.cs
View File

@@ -96,7 +96,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement
} }
catch (FailedOperationException ex) catch (FailedOperationException ex)
{ {
if (ex.InnerException is MissingObjectException && requestParams.ThrowIfNotExist) if (!(ex.InnerException is MissingObjectException) || (ex.InnerException is MissingObjectException && requestParams.ThrowIfNotExist))
{ {
throw; throw;
} }