open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed all static state tracking from job provider.

Browse Source
pull/3113/head
kay.one 13 years ago
parent c23e736cc6
commit 6828f099bc
6 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File

9
NzbDrone.Core.Test/CentralDispatchTest.cs
Unescape View File

@ -84,5 +84,14 @@ namespace NzbDrone.Core.Test
{ {
CentralDispatch.NinjectKernel.Get<QualityProvider>().All().Should().HaveCount(2); CentralDispatch.NinjectKernel.Get<QualityProvider>().All().Should().HaveCount(2);
} }
[Test]
public void JobProvider_should_be_singletone()
{
var first = CentralDispatch.NinjectKernel.Get<JobProvider>();
var second = CentralDispatch.NinjectKernel.Get<JobProvider>();
first.Should().BeSameAs(second);
}
} }
} }

1
NzbDrone.Core.Test/Framework/TestBase.cs
Unescape View File

@ -21,7 +21,6 @@ namespace NzbDrone.Core.Test.Framework
[TearDown] [TearDown]
public void TearDown() public void TearDown()
{ {
JobProvider.Queue.Clear();
ExceptionVerification.AssertNoUnexcpectedLogs(); ExceptionVerification.AssertNoUnexcpectedLogs();
} }

79
NzbDrone.Core.Test/ProviderTests/JobProviderTest.cs
Unescape View File

@ -17,13 +17,6 @@ namespace NzbDrone.Core.Test.ProviderTests
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
public class JobProviderTest : TestBase public class JobProviderTest : TestBase
{ {
[TestFixtureSetUp]
public override void Setup()
{
base.Setup();
JobProvider.Queue.Clear();
}
[Test] [Test]
public void Run_Jobs_Updates_Last_Execution() public void Run_Jobs_Updates_Last_Execution()
{ {
@ -100,13 +93,13 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(MockLib.GetEmptyDatabase()); mocker.SetConstant(MockLib.GetEmptyDatabase());
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
var timerProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize(); jobProvider.Initialize();
timerProvider.QueueJob(typeof(FakeJob)); jobProvider.QueueJob(typeof(FakeJob));
Thread.Sleep(1000); Thread.Sleep(1000);
timerProvider.QueueJob(typeof(FakeJob)); jobProvider.QueueJob(typeof(FakeJob));
Thread.Sleep(2000); Thread.Sleep(2000);
JobProvider.Queue.Should().BeEmpty(); jobProvider.Queue.Should().BeEmpty();
fakeJob.ExecutionCount.Should().Be(2); fakeJob.ExecutionCount.Should().Be(2);
} }
@ -119,15 +112,15 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(MockLib.GetEmptyDatabase()); mocker.SetConstant(MockLib.GetEmptyDatabase());
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
var timerProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize(); jobProvider.Initialize();
timerProvider.QueueJob(typeof(SlowJob), 1); jobProvider.QueueJob(typeof(SlowJob), 1);
timerProvider.QueueJob(typeof(SlowJob), 2); jobProvider.QueueJob(typeof(SlowJob), 2);
timerProvider.QueueJob(typeof(SlowJob), 3); jobProvider.QueueJob(typeof(SlowJob), 3);
Thread.Sleep(5000); Thread.Sleep(5000);
JobProvider.Queue.Should().BeEmpty(); jobProvider.Queue.Should().BeEmpty();
//Asserts are done in ExceptionVerification //Asserts are done in ExceptionVerification
} }
@ -144,15 +137,15 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(MockLib.GetEmptyDatabase()); mocker.SetConstant(MockLib.GetEmptyDatabase());
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
var timerProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize(); jobProvider.Initialize();
timerProvider.QueueJob(typeof(BrokenJob)); jobProvider.QueueJob(typeof(BrokenJob));
Thread.Sleep(2000); Thread.Sleep(2000);
timerProvider.QueueJob(typeof(BrokenJob)); jobProvider.QueueJob(typeof(BrokenJob));
Thread.Sleep(2000); Thread.Sleep(2000);
JobProvider.Queue.Should().BeEmpty(); jobProvider.Queue.Should().BeEmpty();
brokenJob.ExecutionCount.Should().Be(2); brokenJob.ExecutionCount.Should().Be(2);
ExceptionVerification.ExcpectedErrors(2); ExceptionVerification.ExcpectedErrors(2);
} }
@ -201,11 +194,11 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(MockLib.GetEmptyDatabase()); mocker.SetConstant(MockLib.GetEmptyDatabase());
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
var timerProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize(); jobProvider.Initialize();
var thread1 = new Thread(() => timerProvider.QueueJob(typeof(SlowJob))); var thread1 = new Thread(() => jobProvider.QueueJob(typeof(SlowJob)));
var thread2 = new Thread(() => timerProvider.QueueJob(typeof(SlowJob))); var thread2 = new Thread(() => jobProvider.QueueJob(typeof(SlowJob)));
thread1.Start(); thread1.Start();
thread2.Start(); thread2.Start();
@ -216,7 +209,7 @@ namespace NzbDrone.Core.Test.ProviderTests
Thread.Sleep(5000); Thread.Sleep(5000);
Assert.AreEqual(1, slowJob.ExecutionCount); Assert.AreEqual(1, slowJob.ExecutionCount);
JobProvider.Queue.Should().BeEmpty(); jobProvider.Queue.Should().BeEmpty();
} }
@ -364,16 +357,16 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
//Act //Act
var timerProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize(); jobProvider.Initialize();
timerProvider.QueueJob(typeof(FakeJob), 10); jobProvider.QueueJob(typeof(FakeJob), 10);
Thread.Sleep(1000); Thread.Sleep(1000);
//Assert //Assert
var settings = timerProvider.All(); var settings = jobProvider.All();
settings.Should().NotBeEmpty(); settings.Should().NotBeEmpty();
settings[0].LastExecution.Should().HaveYear(2000); settings[0].LastExecution.Should().HaveYear(2000);
JobProvider.Queue.Should().BeEmpty(); jobProvider.Queue.Should().BeEmpty();
} }
[Test] [Test]
@ -386,13 +379,13 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
//Act //Act
var timerProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
timerProvider.Initialize(); jobProvider.Initialize();
timerProvider.QueueJob(typeof(FakeJob), 10); jobProvider.QueueJob(typeof(FakeJob), 10);
Thread.Sleep(1000); Thread.Sleep(1000);
//Assert //Assert
var settings = timerProvider.All(); var settings = jobProvider.All();
Assert.IsNotEmpty(settings); Assert.IsNotEmpty(settings);
Assert.IsFalse(settings[0].Success); Assert.IsFalse(settings[0].Success);
} }
@ -420,7 +413,7 @@ namespace NzbDrone.Core.Test.ProviderTests
//Act //Act
var jobProvider = mocker.Resolve<JobProvider>(); var jobProvider = mocker.Resolve<JobProvider>();
jobProvider.Initialize(); jobProvider.Initialize();
JobProvider.Queue.Add(fakeQueueItem); jobProvider.Queue.Add(fakeQueueItem);
jobProvider.QueueJob(fakeJob.GetType(), 12); jobProvider.QueueJob(fakeJob.GetType(), 12);
Thread.Sleep(1000); Thread.Sleep(1000);
@ -441,19 +434,21 @@ namespace NzbDrone.Core.Test.ProviderTests
mocker.SetConstant(MockLib.GetEmptyDatabase()); mocker.SetConstant(MockLib.GetEmptyDatabase());
mocker.SetConstant(fakeJobs); mocker.SetConstant(fakeJobs);
mocker.Resolve<JobProvider>().Initialize(); var jobProvider = mocker.Resolve<JobProvider>();
jobProvider.Initialize();
var _jobThread = new Thread(() => mocker.Resolve<JobProvider>().QueueScheduled()); var _jobThread = new Thread(() => jobProvider.QueueScheduled());
_jobThread.Start(); _jobThread.Start();
Thread.Sleep(200); Thread.Sleep(200);
mocker.Resolve<JobProvider>().QueueJob(typeof(DisabledJob), 12); jobProvider.QueueJob(typeof(DisabledJob), 12);
Thread.Sleep(3000); Thread.Sleep(3000);
//Assert //Assert
JobProvider.Queue.Should().BeEmpty(); jobProvider.Queue.Should().BeEmpty();
slowJob.ExecutionCount.Should().Be(1); slowJob.ExecutionCount.Should().Be(1);
disabledJob.ExecutionCount.Should().Be(1); disabledJob.ExecutionCount.Should().Be(1);
} }

4
NzbDrone.Core/CentralDispatch.cs
Unescape View File

@ -61,10 +61,10 @@ namespace NzbDrone.Core
_kernel = new StandardKernel(); _kernel = new StandardKernel();
_kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.MainConnectionString)).InTransientScope(); _kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.MainConnectionString)).InTransientScope();
//_kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.MainConnectionString, false)).WhenInjectedInto<IJob>();
//_kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.MainConnectionString, false)).WhenInjectedInto<JobProvider>();
_kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.LogConnectionString, false)).WhenInjectedInto<DatabaseTarget>().InSingletonScope(); _kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.LogConnectionString, false)).WhenInjectedInto<DatabaseTarget>().InSingletonScope();
_kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.LogConnectionString)).WhenInjectedInto<LogProvider>().InSingletonScope(); _kernel.Bind<IDatabase>().ToMethod(c => Connection.GetPetaPocoDb(Connection.LogConnectionString)).WhenInjectedInto<LogProvider>().InSingletonScope();
_kernel.Bind<JobProvider>().ToSelf().InSingletonScope();
} }
} }

9
NzbDrone.Core/Providers/Jobs/JobProvider.cs
Unescape View File

@ -26,11 +26,11 @@ namespace NzbDrone.Core.Providers.Jobs
private readonly NotificationProvider _notificationProvider; private readonly NotificationProvider _notificationProvider;
private readonly IList<IJob> _jobs; private readonly IList<IJob> _jobs;
private static readonly object ExecutionLock = new object();
private Thread _jobThread; private Thread _jobThread;
private static bool _isRunning;
private static readonly List<JobQueueItem> _queue = new List<JobQueueItem>(); private readonly object ExecutionLock = new object();
private bool _isRunning;
private readonly List<JobQueueItem> _queue = new List<JobQueueItem>();
private ProgressNotification _notification; private ProgressNotification _notification;
@ -49,11 +49,10 @@ namespace NzbDrone.Core.Providers.Jobs
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public JobProvider() { } public JobProvider() { }
/// <summary> /// <summary>
/// Gets the active queue. /// Gets the active queue.
/// </summary> /// </summary>
public static List<JobQueueItem> Queue public List<JobQueueItem> Queue
{ {
get get
{ {

2
NzbDrone.Web/Controllers/SystemController.cs
Unescape View File

@ -30,7 +30,7 @@ namespace NzbDrone.Web.Controllers
public ActionResult Jobs() public ActionResult Jobs()
{ {
ViewData["Queue"] = JobProvider.Queue.Select(c => new JobQueueItemModel { ViewData["Queue"] = _jobProvider.Queue.Select(c => new JobQueueItemModel {
Name = c.JobType.Name, Name = c.JobType.Name,
TargetId = c.TargetId, TargetId = c.TargetId,
SecondaryTargetId = c.SecondaryTargetId SecondaryTargetId = c.SecondaryTargetId

Write Preview
Loading…
Cancel
Save