github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-10 23:42:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better handling for #388

Browse source
This commit is contained in:
tidusjar 2016-07-06 14:35:20 +01:00
parent e86bb6624f
commit 26e1d14812
3 changed files with 80 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlexRequests.Api/CouchPotatoApi.cs
View file

@ -126,7 +126,7 @@ namespace PlexRequests.Api
request.AddUrlSegment("apikey", apiKey); request.AddUrlSegment("apikey", apiKey);
var obj = RetryHandler.Execute<CouchPotatoProfiles>(() => Api.Execute<CouchPotatoProfiles> (request, url),null, var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoProfiles> (request, url),null,
(exception, timespan) => Log.Error (exception, "Exception when calling GetProfiles for CP, Retrying {0}", timespan)); (exception, timespan) => Log.Error (exception, "Exception when calling GetProfiles for CP, Retrying {0}", timespan));
return obj; return obj;

130
PlexRequests.Api/RetryHandler.cs
View file

@ -1,71 +1,89 @@
using System; #region Copyright
using Polly.Retry; // /************************************************************************
// Copyright (c) 2016 Jamie Rees
// File: RetryHandler.cs
// Created By: Jamie Rees
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/
#endregion
using System;
using Polly; using Polly;
using System.Threading.Tasks; using Polly.Retry;
namespace PlexRequests.Api namespace PlexRequests.Api
{ {
public static class RetryHandler public static class RetryHandler
{ {
private static readonly TimeSpan[] DefaultTime = { TimeSpan.FromSeconds(2), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10) };
private static readonly TimeSpan[] DefaultTime = new TimeSpan[] { public static T Execute<T>(Func<T> action, TimeSpan[] timeSpan)
TimeSpan.FromSeconds (2), {
TimeSpan.FromSeconds(5), var policy = RetryAndWaitPolicy(timeSpan);
TimeSpan.FromSeconds(10)};
public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan, Action action) return policy.Execute(action);
{ }
if(timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = Policy.Handle<Exception> ()
.WaitAndRetry(timeSpan, (e, ts) => action());
return policy; public static T Execute<T>(Func<T> func, TimeSpan[] timeSpan, Action<Exception, TimeSpan> action)
} {
if (timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = RetryAndWaitPolicy(timeSpan, action);
public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan) return policy.Execute(func);
{ }
if(timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = Policy.Handle<Exception> ()
.WaitAndRetry(timeSpan);
return policy; public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan, Action action)
} {
if (timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = Policy.Handle<Exception>().WaitAndRetry(timeSpan, (e, ts) => action());
public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan, Action<Exception, TimeSpan> action) return policy;
{ }
if(timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = Policy.Handle<Exception> ()
.WaitAndRetry(timeSpan, action);
return policy; public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan)
} {
if (timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = Policy.Handle<Exception>().WaitAndRetry(timeSpan);
public static T Execute<T>(Func<T> action, TimeSpan[] timeSpan) return policy;
{ }
var policy = RetryAndWaitPolicy (timeSpan);
return policy.Execute (action); public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan, Action<Exception, TimeSpan> action)
} {
if (timeSpan == null)
{
timeSpan = DefaultTime;
}
var policy = Policy.Handle<Exception>().WaitAndRetry(timeSpan, action);
public static T Execute<T>(Func<T> func, TimeSpan[] timeSpan, Action<Exception, TimeSpan> action) return policy;
{ }
if(timeSpan == null) }
{
timeSpan = DefaultTime;
}
var policy = RetryAndWaitPolicy (timeSpan, action);
return policy.Execute (func);
}
}
} }

7
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -142,9 +142,10 @@ namespace PlexRequests.UI.Modules
{ {
return await Task.Run(() => CpApi.GetProfiles(cpSettings.FullUri, cpSettings.ApiKey)).ConfigureAwait(false); return await Task.Run(() => CpApi.GetProfiles(cpSettings.FullUri, cpSettings.ApiKey)).ConfigureAwait(false);
}); });
if (result != null)
qualities = result.list.Select(x => new QualityModel() { Id = x._id, Name = x.label }).ToList(); {
qualities = result.list.Select(x => new QualityModel { Id = x._id, Name = x.label }).ToList();
}
} }
catch (Exception e) catch (Exception e)
{ {