Skip to content

Commit a368dce

Browse files
committed
Removing additional logging and try/catch for default headers
1 parent edfd4f2 commit a368dce

File tree

3 files changed

+8
-31
lines changed

3 files changed

+8
-31
lines changed

src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Common/SqlDatabaseExceptionHandler.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,6 @@ public static void WriteErrorDetails(
4545
{
4646
string requestId;
4747
ErrorRecord errorRecord = RetrieveExceptionDetails(exception, out requestId);
48-
if (!string.IsNullOrEmpty(exception.StackTrace))
49-
{
50-
cmdlet.WriteWarning(string.Format("Received exception: {0}\n Stack trace: {1}", exception.Message, exception.StackTrace));
51-
var innerException = exception.InnerException;
52-
while (innerException != null)
53-
{
54-
cmdlet.WriteWarning(string.Format("Inner exception: {0}\n Stack trace: {1}", innerException.Message, innerException.StackTrace));
55-
}
56-
}
5748

5849
// Write the request Id as a warning
5950
if (requestId != null)

src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceCertAuth.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,19 +1314,12 @@ private RestoreDatabaseOperation CreateRestoreDatabaseOperationFromResponse(Rest
13141314
/// <param name="sqlManagementClient">The client to add the headers on.</param>
13151315
private void AddTracingHeaders(SqlManagementClient sqlManagementClient)
13161316
{
1317-
try
1318-
{
1319-
sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
1320-
Constants.ClientSessionIdHeaderName,
1321-
this.ClientSessionId);
1322-
sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
1323-
Constants.ClientRequestIdHeaderName,
1324-
this.ClientRequestId);
1325-
}
1326-
catch
1327-
{
1328-
// do not fail if the http client is being reused
1329-
}
1317+
sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
1318+
Constants.ClientSessionIdHeaderName,
1319+
this.ClientSessionId);
1320+
sqlManagementClient.HttpClient.DefaultRequestHeaders.Add(
1321+
Constants.ClientRequestIdHeaderName,
1322+
this.ClientRequestId);
13301323
}
13311324

13321325
/// <summary>

src/ServiceManagement/Sql/Commands.SqlDatabase/SqlDatabaseCmdletBase.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,8 @@ protected SqlManagementClient GetCurrentSqlClient()
6464
AzureSubscription subscription = Profile.Context.Subscription;
6565
SqlDatabaseCmdletBase.ValidateSubscription(subscription);
6666
SqlManagementClient client = AzureSession.ClientFactory.CreateClient<SqlManagementClient>(Profile, subscription, AzureEnvironment.Endpoint.ServiceManagement);
67-
try
68-
{
69-
client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientSessionIdHeaderName, clientSessionId);
70-
client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, clientRequestId);
71-
}
72-
catch
73-
{
74-
// do not fail if the http client is being reused
75-
}
67+
client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientSessionIdHeaderName, clientSessionId);
68+
client.HttpClient.DefaultRequestHeaders.Add(Constants.ClientRequestIdHeaderName, clientRequestId);
7669
return client;
7770
}
7871

0 commit comments

Comments
 (0)