Skip to content

Commit 3ca96b4

Browse files
odinserjbarclayadam
odinserj
authored and
barclayadam
committed
Add support for Hangfire.SqlServer 1.7.0
There was a breaking change in Hangfire.SqlServer 1.7.0 in IPersistentJobQueueMonitoringApi methods. GetEnqueuedJobIds and GetFetchedJobIds return type was changed to support `bigint` identifiers.
1 parent 8ad1e47 commit 3ca96b4

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

‎nuspecs/Hangfire.Azure.ServiceBusQueue.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<copyright>Copyright © 2015 Sergey Odinokov, Adam Barclay</copyright>
1414
<tags>Hangfire Azure ServiceBus SqlServer</tags>
1515
<dependencies>
16-
<dependency id="Hangfire.Core" version="1.5" />
17-
<dependency id="Hangfire.SqlServer" version="1.5" />
16+
<dependency id="Hangfire.Core" version="1.7.0" />
17+
<dependency id="Hangfire.SqlServer" version="1.7.0" />
1818
<dependency id="WindowsAzure.ServiceBus" version="2.7.5" />
1919
</dependencies>
2020
</metadata>

‎src/HangFire.Azure.ServiceBusQueue/HangFire.Azure.ServiceBusQueue.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<DocumentationFile>bin\Release\Hangfire.Azure.ServiceBusQueue.XML</DocumentationFile>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Hangfire.Core, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\Hangfire.Core.1.5.2\lib\net45\Hangfire.Core.dll</HintPath>
36+
<Reference Include="Hangfire.Core, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\..\packages\Hangfire.Core.1.7.0\lib\net45\Hangfire.Core.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="Hangfire.SqlServer, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\Hangfire.SqlServer.1.5.2\lib\net45\Hangfire.SqlServer.dll</HintPath>
40+
<Reference Include="Hangfire.SqlServer, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Hangfire.SqlServer.1.7.0\lib\net45\Hangfire.SqlServer.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Microsoft.ServiceBus, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/HangFire.Azure.ServiceBusQueue/ServiceBusQueueMonitoringApi.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public IEnumerable<string> GetQueues()
2424
return _queues;
2525
}
2626

27-
public IEnumerable<int> GetEnqueuedJobIds(string queue, int @from, int perPage)
27+
public IEnumerable<long> GetEnqueuedJobIds(string queue, int @from, int perPage)
2828
{
2929
var client = _manager.GetClient(queue);
30-
var jobIds = new List<int>();
30+
var jobIds = new List<long>();
3131

3232
// We have to overfetch to retrieve enough messages for paging.
3333
// e.g. @from = 10 and page size = 20 we need 30 messages from the start
@@ -43,7 +43,7 @@ public IEnumerable<int> GetEnqueuedJobIds(string queue, int @from, int perPage)
4343
// number
4444
if (i >= @from)
4545
{
46-
jobIds.Add(int.Parse(msg.GetBody<string>()));
46+
jobIds.Add(long.Parse(msg.GetBody<string>()));
4747
}
4848

4949
msg.Dispose();
@@ -52,9 +52,9 @@ public IEnumerable<int> GetEnqueuedJobIds(string queue, int @from, int perPage)
5252
return jobIds;
5353
}
5454

55-
public IEnumerable<int> GetFetchedJobIds(string queue, int @from, int perPage)
55+
public IEnumerable<long> GetFetchedJobIds(string queue, int @from, int perPage)
5656
{
57-
return Enumerable.Empty<int>();
57+
return Enumerable.Empty<long>();
5858
}
5959

6060
public EnqueuedAndFetchedCountDto GetEnqueuedAndFetchedCount(string queue)

‎src/HangFire.Azure.ServiceBusQueue/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Hangfire.Core" version="1.5.2" targetFramework="net45" />
4-
<package id="Hangfire.SqlServer" version="1.5.2" targetFramework="net45" />
3+
<package id="Hangfire.Core" version="1.7.0" targetFramework="net45" />
4+
<package id="Hangfire.SqlServer" version="1.7.0" targetFramework="net45" />
55
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net45" />
66
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
77
<package id="Owin" version="1.0" targetFramework="net45" />

‎tests/HangFire.Azure.ServiceBusQueue.Tests/HangFire.Azure.ServiceBusQueue.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Hangfire.Core, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\..\packages\Hangfire.Core.1.5.2\lib\net45\Hangfire.Core.dll</HintPath>
33+
<Reference Include="Hangfire.Core, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
34+
<HintPath>..\..\packages\Hangfire.Core.1.7.0\lib\net45\Hangfire.Core.dll</HintPath>
3535
</Reference>
36-
<Reference Include="Hangfire.SqlServer, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\Hangfire.SqlServer.1.5.2\lib\net45\Hangfire.SqlServer.dll</HintPath>
36+
<Reference Include="Hangfire.SqlServer, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\..\packages\Hangfire.SqlServer.1.7.0\lib\net45\Hangfire.SqlServer.dll</HintPath>
3838
</Reference>
3939
<Reference Include="Microsoft.ServiceBus, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<HintPath>..\..\packages\WindowsAzure.ServiceBus.2.7.5\lib\net40-full\Microsoft.ServiceBus.dll</HintPath>

‎tests/HangFire.Azure.ServiceBusQueue.Tests/ServiceBusQueueMonitoringApiFacts.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void GetEnqueuedJobIds_WhenJobs_ShouldWorkPage1()
9191
var counts = monitor.GetEnqueuedJobIds(options.Queues[0], 0, 5);
9292

9393
// Assert/
94-
Assert.That(counts, Is.EquivalentTo(new[] { 1, 2, 3, 4 }));
94+
Assert.That(counts, Is.EquivalentTo(new long[] { 1, 2, 3, 4 }));
9595
}
9696

9797
[Test]
@@ -108,8 +108,8 @@ public void GetEnqueuedJobIds_WhenJobs_ShouldWorkPage2()
108108
var counts2 = monitor.GetEnqueuedJobIds(options.Queues[0], 2, 2);
109109

110110
// Assert/
111-
Assert.That(counts1, Is.EquivalentTo(new[] { 1, 2 }));
112-
Assert.That(counts2, Is.EquivalentTo(new[] { 3, 4 }));
111+
Assert.That(counts1, Is.EquivalentTo(new long[] { 1, 2 }));
112+
Assert.That(counts2, Is.EquivalentTo(new long[] { 3, 4 }));
113113
}
114114

115115
[Test]
@@ -125,7 +125,7 @@ public void GetEnqueuedJobIds_WhenJobs_ShouldWorkWithLargeValues()
125125
var counts = monitor.GetEnqueuedJobIds(options.Queues[0], 58, 2);
126126

127127
// Assert/
128-
Assert.That(counts, Is.EquivalentTo(new[] { 58, 59 }));
128+
Assert.That(counts, Is.EquivalentTo(new long[] { 58, 59 }));
129129
}
130130
}
131131
}

‎tests/HangFire.Azure.ServiceBusQueue.Tests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Hangfire.Core" version="1.5.2" targetFramework="net452" />
4-
<package id="Hangfire.SqlServer" version="1.5.2" targetFramework="net452" />
3+
<package id="Hangfire.Core" version="1.7.0" targetFramework="net452" />
4+
<package id="Hangfire.SqlServer" version="1.7.0" targetFramework="net452" />
55
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net452" />
66
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
77
<package id="NUnit" version="3.6.1" targetFramework="net452" />

0 commit comments

Comments
 (0)