Skip to content

fix typo: IsHightAvailability -> IsHighAvailability #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 5, 2019
Merged

fix typo: IsHightAvailability -> IsHighAvailability #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c1ecf8
Merge pull request #98 from dotnetcore/dev
catcherwong Mar 19, 2019
b49c92b
Merge pull request #102 from dotnetcore/dev
catcherwong Mar 28, 2019
60da609
Merge pull request #107 from dotnetcore/dev
catcherwong Apr 20, 2019
f57fcb2
Merge pull request #109 from dotnetcore/dev
catcherwong Apr 28, 2019
148a556
Merge pull request #110 from dotnetcore/dev
catcherwong May 3, 2019
003bbc1
fix typo: IsHightAvailability -> IsHighAvailability
Rwing May 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/AspectCore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Property | Description | Apply
---|---|---
CacheKeyPrefix | To specify the prefix of your cache key | All
CacheProviderName | To specify which provider you want to use | All
IsHightAvailability | Whether caching opreation will break your method | All
IsHighAvailability | Whether caching opreation will break your method | All
Expiration | To specify the expiration of your cache item，the unit is second | EasyCachingAble and EasyCachingPut
IsAll | Whether remove all the cached items start with the CacheKeyPrefix | EasyCachingEvict only
IsBefore | Remove the cached item before method excute or after method excute | EasyCachingEvict only
Expand Down
2 changes: 1 addition & 1 deletion docs/Castle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Property | Description | Apply
---|---|---
CacheKeyPrefix | To specify the prefix of your cache key | All
CacheProviderName | To specify which provider you want to use | All
IsHightAvailability | Whether caching opreation will break your method | All
IsHighAvailability | Whether caching opreation will break your method | All
Expiration | To specify the expiration of your cache item，the unit is second | EasyCachingAble and EasyCachingPut
IsAll | Whether remove all the cached items start with the CacheKeyPrefix | EasyCachingEvict only
IsBefore | Remove the cached item before method excute or after method excute | EasyCachingEvict only
Expand Down
2 changes: 1 addition & 1 deletion src/EasyCaching.Core/Interceptor/EasyCachingInterceptorAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class EasyCachingInterceptorAttribute : Attribute
/// Prevent cache provider errors from affecting business
/// </summary>
/// <value>The cache key prefix.</value>
public bool IsHightAvailability { get; set; } = true;
public bool IsHighAvailability { get; set; } = true;
}

/// <summary>
Expand Down
30 changes: 15 additions & 15 deletions src/EasyCaching.Interceptor.AspectCore/EasyCachingInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private async Task ProceedAbleAsync(AspectContext context, AspectDelegate next)
}
catch (Exception ex)
{
if (!attribute.IsHightAvailability)
if (!attribute.IsHighAvailability)
{
throw;
}
Expand Down Expand Up @@ -142,20 +142,20 @@ private async Task ProceedAbleAsync(AspectContext context, AspectDelegate next)
// Invoke the method if we don't have a cache hit
await next(context);

if (isAvailable)
{
// get the result
var returnValue = context.IsAsync()
? await context.UnwrapAsyncReturnValue()
: context.ReturnValue;

if (isAvailable)
{
// get the result
var returnValue = context.IsAsync()
? await context.UnwrapAsyncReturnValue()
: context.ReturnValue;
// should we do something when method return null?
// 1. cached a null value for a short time
// 2. do nothing
if (returnValue != null)
{
await _cacheProvider.SetAsync(cacheKey, returnValue, TimeSpan.FromSeconds(attribute.Expiration));
}
// 2. do nothing
if (returnValue != null)
{
await _cacheProvider.SetAsync(cacheKey, returnValue, TimeSpan.FromSeconds(attribute.Expiration));
}
}
}
}
Expand Down Expand Up @@ -194,7 +194,7 @@ private async Task ProcessPutAsync(AspectContext context)
}
catch (Exception ex)
{
if (!attribute.IsHightAvailability) throw;
if (!attribute.IsHighAvailability) throw;
else Logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" set error.");
}
}
Expand Down Expand Up @@ -230,7 +230,7 @@ private async Task ProcessEvictAsync(AspectContext context, bool isBefore)
}
catch (Exception ex)
{
if (!attribute.IsHightAvailability) throw;
if (!attribute.IsHighAvailability) throw;
else Logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" remove error.");
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/EasyCaching.Interceptor.Castle/EasyCachingInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private void ProceedAble(IInvocation invocation)
}
catch (Exception ex)
{
if (!attribute.IsHightAvailability)
if (!attribute.IsHighAvailability)
{
throw;
}
Expand Down Expand Up @@ -193,7 +193,7 @@ private void ProcessPut(IInvocation invocation)
}
catch (Exception ex)
{
if (!attribute.IsHightAvailability) throw;
if (!attribute.IsHighAvailability) throw;
else _logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" set error.");
}
}
Expand Down Expand Up @@ -230,7 +230,7 @@ private void ProcessEvict(IInvocation invocation, bool isBefore)
}
catch (Exception ex)
{
if (!attribute.IsHightAvailability) throw;
if (!attribute.IsHighAvailability) throw;
else _logger?.LogError(new EventId(), ex, $"Cache provider \"{_cacheProvider.Name}\" remove error.");
}
}
Expand Down