From 54c29f20a62d59a2482a3e01a89e87f8bff31c8f Mon Sep 17 00:00:00 2001 From: Leila Lali Date: Thu, 2 Nov 2017 17:53:18 +0000 Subject: [PATCH] binding queue should not throw excpetion if fails to connect (#542) --- .../RestoreOperation/RestoreDatabaseTaskDataObject.cs | 1 + .../LanguageServices/ConnectedBindingQueue.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs index 3e9ea00e..7e2fda66 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs @@ -316,6 +316,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation } catch(Exception ex) { + Logger.Write(LogLevel.Normal, $"Failed to execute restore task. error: {ex.Message}"); throw ex; } finally diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs index c1d23ca2..1c4fc414 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs @@ -125,7 +125,14 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices { if (bindingContext.BindingLock.WaitOne(millisecondsTimeout)) { - bindingContext.ServerConnection.Connect(); + try + { + bindingContext.ServerConnection.Connect(); + } + catch + { + //TODO: remove the binding context? + } } } }