Skip to content

Commit c3b503e

Browse files
danielgerlagdanielgerlag
committed
azure storage
1 parent d082e25 commit c3b503e

File tree

23 files changed

+109
-280
lines changed

23 files changed

+109
-280
lines changed

‎WorkflowCore.sln‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.6
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF47161E-E399-451C-BDE8-E92AAD3BD761}"
77
EndProject
@@ -42,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Persistence.Sq
4242
EndProject
4343
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.LockProviders.Redlock", "src\providers\WorkflowCore.LockProviders.Redlock\WorkflowCore.LockProviders.Redlock.csproj", "{05250D58-A59E-4212-8D55-E7BC0396E9F5}"
4444
EndProject
45-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.LockProviders.ZooKeeper", "src\providers\WorkflowCore.LockProviders.ZooKeeper\WorkflowCore.LockProviders.ZooKeeper.csproj", "{3BBA51EE-765A-4772-A940-7F853E1010FC}"
46-
EndProject
4745
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.QueueProviders.RabbitMQ", "src\providers\WorkflowCore.QueueProviders.RabbitMQ\WorkflowCore.QueueProviders.RabbitMQ.csproj", "{AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}"
4846
EndProject
4947
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Sample06", "src\samples\WorkflowCore.Sample06\WorkflowCore.Sample06.csproj", "{8FEAFD74-C304-4F75-BA38-4686BE55C891}"
@@ -144,10 +142,6 @@ Global
144142
{05250D58-A59E-4212-8D55-E7BC0396E9F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
145143
{05250D58-A59E-4212-8D55-E7BC0396E9F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
146144
{05250D58-A59E-4212-8D55-E7BC0396E9F5}.Release|Any CPU.Build.0 = Release|Any CPU
147-
{3BBA51EE-765A-4772-A940-7F853E1010FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148-
{3BBA51EE-765A-4772-A940-7F853E1010FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
149-
{3BBA51EE-765A-4772-A940-7F853E1010FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
150-
{3BBA51EE-765A-4772-A940-7F853E1010FC}.Release|Any CPU.Build.0 = Release|Any CPU
151145
{AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
152146
{AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Debug|Any CPU.Build.0 = Debug|Any CPU
153147
{AFAD87C7-B2EE-451E-BA7E-3F5A91358C48}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -260,7 +254,6 @@ Global
260254
{9274B938-3996-4FBA-AE2F-0C82009B1116} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}
261255
{86BC1E05-E9CE-4E53-B324-885A2FDBCE74} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}
262256
{05250D58-A59E-4212-8D55-E7BC0396E9F5} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}
263-
{3BBA51EE-765A-4772-A940-7F853E1010FC} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}
264257
{AFAD87C7-B2EE-451E-BA7E-3F5A91358C48} = {2EEE6ABD-EE9B-473F-AF2D-6DABB85D7BA2}
265258
{8FEAFD74-C304-4F75-BA38-4686BE55C891} = {5080DB09-CBE8-4C45-9957-C3BB7651755E}
266259
{37B598A8-B054-4ABA-884D-96AEF2511600} = {E6CEAD8D-F565-471E-A0DC-676F54EAEDEB}

‎src/WorkflowCore/Interface/IDistributedLockProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public interface IDistributedLockProvider
1515

1616
Task ReleaseLock(string Id);
1717

18-
void Start();
18+
Task Start();
1919

20-
void Stop();
20+
Task Stop();
2121
}
2222
}

‎src/WorkflowCore/Interface/IQueueProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public interface IQueueProvider : IDisposable
2727
/// <returns></returns>
2828
Task<string> DequeueWork(QueueType queue);
2929

30-
void Start();
31-
void Stop();
30+
Task Start();
31+
Task Stop();
3232

3333
}
3434

‎src/WorkflowCore/Interface/IWorkflowHost.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ namespace WorkflowCore.Interface
99
{
1010
public interface IWorkflowHost
1111
{
12-
void Start();
13-
void Stop();
12+
Task Start();
13+
Task Stop();
1414
Task<string> StartWorkflow(string workflowId, object data = null);
1515
Task<string> StartWorkflow(string workflowId, int? version, object data = null);
1616
Task<string> StartWorkflow<TData>(string workflowId, TData data = null) where TData : class;

‎src/WorkflowCore/Services/RunnablePoller.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,25 @@ public void Stop()
4545
/// Poll the persistence store for workflows ready to run.
4646
/// Poll the persistence store for stashed unpublished events
4747
/// </summary>
48-
private void PollRunnables(object target)
48+
private async void PollRunnables(object target)
4949
{
5050
try
5151
{
52-
if (_lockProvider.AcquireLock("poll runnables").Result)
52+
if (await _lockProvider.AcquireLock("poll runnables"))
5353
{
5454
try
5555
{
5656
_logger.LogInformation("Polling for runnable workflows");
57-
var runnables = _persistenceStore.GetRunnableInstances().Result;
57+
var runnables = await _persistenceStore.GetRunnableInstances();
5858
foreach (var item in runnables)
5959
{
6060
_logger.LogDebug("Got runnable instance {0}", item);
61-
_queueProvider.QueueWork(item, QueueType.Workflow);
61+
await _queueProvider.QueueWork(item, QueueType.Workflow);
6262
}
6363
}
6464
finally
6565
{
66-
_lockProvider.ReleaseLock("poll runnables").Wait();
66+
await _lockProvider.ReleaseLock("poll runnables");
6767
}
6868
}
6969
}
@@ -74,21 +74,21 @@ private void PollRunnables(object target)
7474

7575
try
7676
{
77-
if (_lockProvider.AcquireLock("unprocessed events").Result)
77+
if (await _lockProvider.AcquireLock("unprocessed events"))
7878
{
7979
try
8080
{
8181
_logger.LogInformation("Polling for unprocessed events");
82-
var events = _persistenceStore.GetRunnableEvents().Result.ToList();
83-
foreach (var item in events)
82+
var events = await _persistenceStore.GetRunnableEvents();
83+
foreach (var item in events.ToList())
8484
{
8585
_logger.LogDebug($"Got unprocessed event {item}");
86-
_queueProvider.QueueWork(item, QueueType.Event);
86+
await _queueProvider.QueueWork(item, QueueType.Event);
8787
}
8888
}
8989
finally
9090
{
91-
_lockProvider.ReleaseLock("unprocessed events").Wait();
91+
await _lockProvider.ReleaseLock("unprocessed events");
9292
}
9393
}
9494
}

‎src/WorkflowCore/Services/SingleNodeLockProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public async Task ReleaseLock(string Id)
3737
}
3838
}
3939

40-
public void Start()
40+
public async Task Start()
4141
{
4242

4343
}
4444

45-
public void Stop()
45+
public async Task Stop()
4646
{
4747

4848
}

‎src/WorkflowCore/Services/SingleNodeQueueProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public async Task<string> DequeueWork(QueueType queue)
3232
return null;
3333
}
3434

35-
public void Start()
35+
public async Task Start()
3636
{
3737
}
3838

39-
public void Stop()
39+
public async Task Stop()
4040
{
4141
}
4242

‎src/WorkflowCore/Services/WorkflowHost.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ public async Task<string> StartWorkflow<TData>(string workflowId, int? version,
8989
return id;
9090
}
9191

92-
public void Start()
92+
public async Task Start()
9393
{
9494
_shutdown = false;
95-
QueueProvider.Start();
96-
LockProvider.Start();
95+
await QueueProvider.Start();
96+
await LockProvider.Start();
9797
for (int i = 0; i < Options.ThreadCount; i++)
9898
{
9999
Logger.LogInformation("Starting worker thread #{0}", i);
@@ -113,7 +113,7 @@ public void Start()
113113
poller.Start();
114114
}
115115

116-
public void Stop()
116+
public async Task Stop()
117117
{
118118
_shutdown = true;
119119

@@ -124,8 +124,8 @@ public void Stop()
124124
_workers.Clear();
125125
Logger.LogInformation("Worker threads stopped");
126126

127-
QueueProvider.Stop();
128-
LockProvider.Stop();
127+
await QueueProvider.Stop();
128+
await LockProvider.Stop();
129129
}
130130

131131
public async Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null)
@@ -167,7 +167,7 @@ public void RegisterWorkflow<TWorkflow, TData>()
167167

168168
public async Task<bool> SuspendWorkflow(string workflowId)
169169
{
170-
if (LockProvider.AcquireLock(workflowId).Result)
170+
if (await LockProvider.AcquireLock(workflowId))
171171
{
172172
try
173173
{
@@ -190,7 +190,7 @@ public async Task<bool> SuspendWorkflow(string workflowId)
190190

191191
public async Task<bool> ResumeWorkflow(string workflowId)
192192
{
193-
if (LockProvider.AcquireLock(workflowId).Result)
193+
if (await LockProvider.AcquireLock(workflowId))
194194
{
195195
bool requeue = false;
196196
try
@@ -217,7 +217,7 @@ public async Task<bool> ResumeWorkflow(string workflowId)
217217

218218
public async Task<bool> TerminateWorkflow(string workflowId)
219219
{
220-
if (LockProvider.AcquireLock(workflowId).Result)
220+
if (await LockProvider.AcquireLock(workflowId))
221221
{
222222
try
223223
{

‎src/WorkflowCore/WorkflowCore.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1919
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2020
<Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
21-
<Version>1.2.6</Version>
22-
<AssemblyVersion>1.2.6.0</AssemblyVersion>
23-
<FileVersion>1.2.6.0</FileVersion>
24-
<PackageReleaseNotes>Added Parallel steps</PackageReleaseNotes>
21+
<Version>1.2.7</Version>
22+
<AssemblyVersion>1.2.7.0</AssemblyVersion>
23+
<FileVersion>1.2.7.0</FileVersion>
24+
<PackageReleaseNotes></PackageReleaseNotes>
2525
</PropertyGroup>
2626

2727
<ItemGroup>

‎src/providers/WorkflowCore.LockProviders.Redlock/Services/RedlockProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,12 @@ protected void Unlock(Lock lockObject)
184184
});
185185
}
186186

187-
public void Start()
187+
public async Task Start()
188188
{
189189

190190
}
191191

192-
public void Stop()
192+
public async Task Stop()
193193
{
194194

195195
}

0 commit comments

Comments
 (0)