Skip to content

Commit

Permalink
Cleaned up context disposal (Azure#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
@KrzysztofCwalina
KrzysztofCwalina authored Jan 8, 2019
1 parent b598b49 commit 6ddcfe6
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 89 deletions.
133 changes: 49 additions & 84 deletions Azure.Configuration/ConfigurationClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public partial class ConfigurationClient
{
const string SdkName = "Azure.Configuration";
const string SdkVersion = "1.0.0";

readonly Uri _baseUri;
readonly string _credential;
readonly byte[] _secret;
PipelineOptions _options;
ClientPipeline Pipeline;

public ConfigurationClient(string connectionString)
: this(connectionString, options : new PipelineOptions())
public ConfigurationClient(string connectionString)
: this(connectionString, options: new PipelineOptions())
{
}

Expand All @@ -44,29 +44,24 @@ public async Task<Response<ConfigurationSetting>> AddAsync(ConfigurationSetting

Uri uri = BuildUrlForKvRoute(setting);

PipelineCallContext context = null;
try
using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
context = Pipeline.CreateContext(_options, cancellation);
ReadOnlyMemory<byte> content = Serialize(setting);

context.AddRequestLine(ServiceMethod.Put, uri);
context.AddHeader(MediaTypeKeyValueApplicationHeader);
context.AddHeader(IfNoneMatchWildcard);
context.AddHeader(Header.Common.JsonContentType);

ReadOnlyMemory<byte> content = Serialize(setting);
context.AddHeader(IfNoneMatchWildcard);

AddAuthenticationHeaders(context, uri, ServiceMethod.Put, content, _secret, _credential);
context.AddHeader(MediaTypeKeyValueApplicationHeader);
context.AddHeader(Header.Common.JsonContentType);
context.AddHeader(Header.Common.CreateContentLength(content.Length));
AddAuthenticationHeaders(context, uri, ServiceMethod.Put, content, _secret, _credential);

context.AddContent(PipelineContent.Create(content));

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose(); // TODO (pri 1) : should we always dispose given the content is eagerly deserialized?
throw;
return await CreateResponse(context);
}
}

Expand All @@ -77,27 +72,22 @@ public async Task<Response<ConfigurationSetting>> SetAsync(ConfigurationSetting

Uri uri = BuildUrlForKvRoute(setting);

PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);
using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
ReadOnlyMemory<byte> content = Serialize(setting);

context.AddRequestLine(ServiceMethod.Put, uri);

context.AddHeader(MediaTypeKeyValueApplicationHeader);
context.AddHeader(Header.Common.JsonContentType);

ReadOnlyMemory<byte> content = Serialize(setting);

AddAuthenticationHeaders(context, uri, ServiceMethod.Put, content, _secret, _credential);
context.AddHeader(Header.Common.CreateContentLength(content.Length));
AddAuthenticationHeaders(context, uri, ServiceMethod.Put, content, _secret, _credential);

context.AddContent(PipelineContent.Create(content));

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose();
throw;
return await CreateResponse(context);
}
}

Expand All @@ -109,28 +99,24 @@ public async Task<Response<ConfigurationSetting>> UpdateAsync(ConfigurationSetti

Uri uri = BuildUrlForKvRoute(setting);

PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);
using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
ReadOnlyMemory<byte> content = Serialize(setting);

context.AddRequestLine(ServiceMethod.Put, uri);
context.AddHeader(MediaTypeKeyValueApplicationHeader);
context.AddHeader(IfMatchName, $"\"{setting.ETag}\"");
context.AddHeader(Header.Common.JsonContentType);

ReadOnlyMemory<byte> content = Serialize(setting);
context.AddHeader(IfMatchName, $"\"{setting.ETag}\"");

AddAuthenticationHeaders(context, uri, ServiceMethod.Put, content, _secret, _credential);
context.AddHeader(MediaTypeKeyValueApplicationHeader);
context.AddHeader(Header.Common.JsonContentType);
context.AddHeader(Header.Common.CreateContentLength(content.Length));
AddAuthenticationHeaders(context, uri, ServiceMethod.Put, content, _secret, _credential);

context.AddContent(PipelineContent.Create(content));

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose();
throw;
return await CreateResponse(context);
}
}

Expand All @@ -140,21 +126,16 @@ public async Task<Response<ConfigurationSetting>> DeleteAsync(string key, Settin

Uri uri = BuildUrlForKvRoute(key, filter);

PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);
using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
context.AddRequestLine(ServiceMethod.Delete, uri);

AddFilterHeaders(filter, context);
AddAuthenticationHeaders(context, uri, ServiceMethod.Delete, content: default, _secret, _credential);

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose();
throw;
return await CreateResponse(context);
}
}

Expand All @@ -164,20 +145,15 @@ public async Task<Response<ConfigurationSetting>> LockAsync(string key, SettingF

Uri uri = BuildUriForLocksRoute(key, filter);

PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);
using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
context.AddRequestLine(ServiceMethod.Put, uri);

AddFilterHeaders(filter, context);

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose();
throw;
return await CreateResponse(context);
}
}

Expand All @@ -187,20 +163,15 @@ public async Task<Response<ConfigurationSetting>> UnlockAsync(string key, Settin

Uri uri = BuildUriForLocksRoute(key, filter);

PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);
using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
context.AddRequestLine(ServiceMethod.Delete, uri);

AddFilterHeaders(filter, context);

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose();
throw;
return await CreateResponse(context);
}
}

Expand All @@ -209,10 +180,9 @@ public async Task<Response<ConfigurationSetting>> GetAsync(string key, SettingFi
if (string.IsNullOrEmpty(key)) throw new ArgumentNullException($"{nameof(key)}");

Uri uri = BuildUrlForKvRoute(key, filter);

PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);

using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
context.AddRequestLine(ServiceMethod.Get, uri);

context.AddHeader(MediaTypeKeyValueApplicationHeader);
Expand All @@ -223,45 +193,40 @@ public async Task<Response<ConfigurationSetting>> GetAsync(string key, SettingFi

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

return await CreateKeyValueResponse(context);
}
catch {
if (context != null) context.Dispose();
throw;
return await CreateResponse(context);
}
}

public async Task<Response<SettingBatch>> GetBatchAsync(BatchFilter filter, CancellationToken cancellation = default)
{
var uri = BuildUrlForGetBatch(filter);
PipelineCallContext context = null;
try {
context = Pipeline.CreateContext(_options, cancellation);

using (PipelineCallContext context = Pipeline.CreateContext(_options, cancellation))
{
context.AddRequestLine(ServiceMethod.Get, uri);

context.AddHeader(MediaTypeKeyValueApplicationHeader);
if (filter.Revision != null) {
if (filter.Revision != null)
{
context.AddHeader(AcceptDatetimeHeader, filter.Revision.Value.UtcDateTime.ToString(AcceptDateTimeFormat));
}

await Pipeline.ProcessAsync(context).ConfigureAwait(false);

ServiceResponse response = context.Response;
if (!response.TryGetHeader(Header.Constants.ContentLength, out long contentLength)) {
if (!response.TryGetHeader(Header.Constants.ContentLength, out long contentLength))
{
throw new Exception("bad response: no content length header");
}

if (response.Status != 200) {
if (response.Status != 200)
{
return new Response<SettingBatch>(response);
}

var batch = await ConfigurationServiceSerializer.ParseBatchAsync(response, cancellation);
return new Response<SettingBatch>(response, batch);
}
catch {
if (context != null) context.Dispose();
throw;
}
}
}
}
6 changes: 1 addition & 5 deletions Azure.Configuration/ConfigurationClient_private.cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
using Azure.Core;
using Azure.Core.Net;
using System;
using System.Buffers;
using System.ComponentModel;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using System.Text.JsonLab;
using System.Threading.Tasks;
using static System.Buffers.Text.Encodings;

namespace Azure.Configuration
{
Expand Down Expand Up @@ -46,7 +42,7 @@ static void AddFilterHeaders(SettingFilter filter, PipelineCallContext context)
}
}

static async Task<Response<ConfigurationSetting>> CreateKeyValueResponse(PipelineCallContext context)
static async Task<Response<ConfigurationSetting>> CreateResponse(PipelineCallContext context)
{
ServiceResponse response = context.Response;

Expand Down

0 comments on commit 6ddcfe6

Please sign in to comment.