Add multiple workers per server.

hhalim · Apr 19, 2017 · e1506ae · e1506ae
1 parent 740c39a
commit e1506ae
Show file tree

Hide file tree

Showing 17 changed files with 607 additions and 403 deletions.
diff --git a/Shift.Cache.Redis/Properties/AssemblyInfo.cs b/Shift.Cache.Redis/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.3")]
+[assembly: AssemblyVersion("1.0.7.0")]
diff --git a/Shift.Cache.Redis/Shift.Cache.Redis.csproj b/Shift.Cache.Redis/Shift.Cache.Redis.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Shift.Cache.Redis/packages.config b/Shift.Cache.Redis/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
   <package id="StackExchange.Redis" version="1.2.1" targetFramework="net461" />
 </packages>
diff --git a/Shift.DataLayer/JobDALRedis.cs b/Shift.DataLayer/JobDALRedis.cs
@@ -292,7 +292,7 @@ private async Task<int> SetCommandStopAsync(ICollection<string> jobIDs, bool isS
             var count = 0;
             var command = JobCommand.Stop.ToString().ToLower();
             var jobStopIndex = JobCommandIndexTemplate.Replace("[command]", command);
-            var jobStopProcess = JobCommandProcessTemplate.Replace("[command]", command);
+            var jobStopProcessCommand = JobCommandProcessTemplate.Replace("[command]", command);
             foreach (var jobID in jobIDs) {
                 var jobKey = JobKeyPrefix + jobID;
 
@@ -307,7 +307,7 @@ private async Task<int> SetCommandStopAsync(ICollection<string> jobIDs, bool isS
                     }
                     else
                     {
-                        jobStopProcess = jobStopProcess.Replace("[processid]", job.ProcessID);
+                        var jobStopProcess = jobStopProcessCommand.Replace("[processid]", job.ProcessID);
                         trn.SetAddAsync(jobStopProcess, jobKey); //set job-[command]:[processID] job:123 ""
                     }
                     trn.HashSetAsync(jobKey, JobFields.Command, JobCommand.Stop);

diff --git a/Shift.DataLayer/Properties/AssemblyInfo.cs b/Shift.DataLayer/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.3")]
+[assembly: AssemblyVersion("1.0.7.0")]
diff --git a/Shift.DataLayer/Shift.DataLayer.csproj b/Shift.DataLayer/Shift.DataLayer.csproj
@@ -47,8 +47,8 @@
       <HintPath>..\packages\MongoDB.Driver.Core.2.4.3\lib\net45\MongoDB.Driver.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -60,8 +60,8 @@
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />

diff --git a/Shift.DataLayer/packages.config b/Shift.DataLayer/packages.config
@@ -4,7 +4,7 @@
   <package id="MongoDB.Bson" version="2.4.3" targetFramework="net461" />
   <package id="MongoDB.Driver" version="2.4.3" targetFramework="net461" />
   <package id="MongoDB.Driver.Core" version="2.4.3" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
   <package id="StackExchange.Redis" version="1.2.1" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
 </packages>
diff --git a/Shift.Entities/Properties/AssemblyInfo.cs b/Shift.Entities/Properties/AssemblyInfo.cs
@@ -35,4 +35,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.3")]
+[assembly: AssemblyVersion("1.0.7.0")]
diff --git a/Shift.Entities/Shift.Entities.csproj b/Shift.Entities/Shift.Entities.csproj
@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Shift.Entities/packages.config b/Shift.Entities/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
 </packages>
diff --git a/Shift.UnitTest/Properties/AssemblyInfo.cs b/Shift.UnitTest/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.3")]
+[assembly: AssemblyVersion("1.0.7.0")]