Add suspend and resume functionality

Hangfire.sln.DotSettings

@@ -11,4 +11,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Hangfire.Core.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Hangfire.SqlServer.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hangfire/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hangfire/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Odinokov/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sergey/@EntryIndexedValue">True</s:Boolean>
+	</wpf:ResourceDictionary>

src/Hangfire.AspNetCore/Hangfire.AspNetCore.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net451;net461;netstandard1.3;netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net48;net451;net461;netstandard1.3;netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>1591</NoWarn>
     <RootNamespace>Hangfire</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net45' or '$(TargetFramework)'=='net461'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45' or '$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net48'">
     <DebugType>full</DebugType>
   </PropertyGroup>
 
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netstandard2.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net48'">
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.0" />

src/Hangfire.Core/Common/JobFilterAttribute.cs

@@ -16,8 +16,10 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using Newtonsoft.Json;
 
 namespace Hangfire.Common
 {
@@ -30,8 +32,11 @@ public abstract class JobFilterAttribute : Attribute, IJobFilter
         private static readonly ConcurrentDictionary<Type, bool> MultiuseAttributeCache = new ConcurrentDictionary<Type, bool>();
         private int _order = JobFilter.DefaultOrder;
 
+        [JsonIgnore]
         public bool AllowMultiple => AllowsMultiple(GetType());
 
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
+        [DefaultValue(JobFilter.DefaultOrder)]
         public int Order
         {
             get { return _order; }
@@ -45,6 +50,11 @@ public int Order
             }
         }
 
+#if !NETSTANDARD1_3
+        [JsonIgnore]
+        public override object TypeId => base.TypeId;
+#endif
+
         private static bool AllowsMultiple(Type attributeType)
         {
             return MultiuseAttributeCache.GetOrAdd(

src/Hangfire.Core/Dashboard/Content/js/hangfire.js

@@ -61,9 +61,10 @@
     })();
 
     hangfire.RealtimeGraph = (function() {
-        function RealtimeGraph(element, succeeded, failed, succeededStr, failedStr, pollInterval) {
+        function RealtimeGraph(element, succeeded, failed, deleted, succeededStr, failedStr, deletedStr, pollInterval) {
             this._succeeded = succeeded;
             this._failed = failed;
+            this._deleted = deleted;
             this._last = Date.now();
             this._pollInterval = pollInterval;
 
@@ -72,7 +73,8 @@
                 data: {
                     datasets: [
                         { label: succeededStr, borderColor: '#62B35F', backgroundColor: '#6FCD6D' },
-                        { label: failedStr, borderColor: '#BB4847', backgroundColor: '#D55251' }
+                        { label: failedStr, borderColor: '#BB4847', backgroundColor: '#D55251' },
+                        { label: deletedStr, borderColor: '#777777', backgroundColor: '#919191' }
                     ]
                 },
                 options: {
@@ -98,20 +100,24 @@
         RealtimeGraph.prototype.appendHistory = function (statistics) {
             var newSucceeded = parseInt(statistics["succeeded:count"].intValue);
             var newFailed = parseInt(statistics["failed:count"].intValue);
+            var newDeleted = parseInt(statistics["deleted:count"].intValue);
             var now = Date.now();
 
             if (this._succeeded !== null && this._failed !== null && (now - this._last < this._pollInterval * 2)) {
                 var succeeded = Math.max(newSucceeded - this._succeeded, 0);
                 var failed = Math.max(newFailed - this._failed, 0);
+                var deleted = Math.max(newDeleted - this._deleted, 0);
 
-                this._chart.data.datasets[0].data.push({ x: new Date(), y: succeeded });
-                this._chart.data.datasets[1].data.push({ x: new Date(), y: failed });   
+                this._chart.data.datasets[0].data.push({ x: now, y: succeeded });
+                this._chart.data.datasets[1].data.push({ x: now, y: failed });
+                this._chart.data.datasets[2].data.push({ x: now, y: deleted });
 
                 this._chart.update();
             }
 
             this._succeeded = newSucceeded;
             this._failed = newFailed;
+            this._deleted = newDeleted;
             this._last = now;
         };
 
@@ -232,10 +238,12 @@
             if (realtimeElement) {
                 var succeeded = parseInt($(realtimeElement).data('succeeded'));
                 var failed = parseInt($(realtimeElement).data('failed'));
+                var deleted = parseInt($(realtimeElement).data('deleted'));
 
                 var succeededStr = $(realtimeElement).data('succeeded-string');
                 var failedStr = $(realtimeElement).data('failed-string');
-                var realtimeGraph = new Hangfire.RealtimeGraph(realtimeElement, succeeded, failed, succeededStr, failedStr, pollInterval);
+                var deletedStr = $(realtimeElement).data('deleted-string');
+                var realtimeGraph = new Hangfire.RealtimeGraph(realtimeElement, succeeded, failed, deleted, succeededStr, failedStr, deletedStr, pollInterval);
 
                 this._poller.addListener(function (data) {
                     realtimeGraph.appendHistory(data);

src/Hangfire.Core/Dashboard/Content/resx/Strings.resx

@@ -545,7 +545,33 @@
   <data name="Common_Error" xml:space="preserve">
     <value>Error</value>
   </data>
+
+  <data name="JobsSidebarMenu_Suspended" xml:space="preserve">
+    <value>Suspended</value>
+  </data>
+  <data name="Metrics_SuspendedCount" xml:space="preserve">
+    <value>Suspended</value>
+  </data>
+  <data name="SuspendedPage_Warning_Html" xml:space="preserve">
+    <value>&lt;h4&gt;This page can't be displayed&lt;/h4&gt;
+        &lt;p&gt;
+            Don't worry, suspend is working as expected. Your current job storage does not support
+            some queries required to show this page. Please try to update your storage or wait until
+            the full command set is implemented.
+        &lt;/p&gt;
+        &lt;p&gt;
+            Please go to the &lt;a href="{0}"&gt;Scheduled jobs&lt;/a&gt; page to see all the
+            scheduled jobs including retries.
+        &lt;/p&gt;</value>
+  </data>
+  <data name="SuspendedJobsPage_NoJobs" xml:space="preserve">
+    <value>All is OK – you have no suspended.</value>
+  </data>
+  <data name="SuspendedJobsPage_Title" xml:space="preserve">
+    <value>Suspended Jobs</value>
+ </data>
   <data name="JobDetailsPage_Parameters" xml:space="preserve">
     <value>Parameters</value>
+
   </data>
 </root>

src/Hangfire.Core/Dashboard/DashboardMetrics.cs

@@ -62,7 +62,7 @@ public static IEnumerable<DashboardMetric> GetMetrics()
         }
 
         public static readonly DashboardMetric ServerCount = new DashboardMetric(
-            "servers:count", 
+            "servers:count",
             "Metrics_Servers",
             page => new Metric(page.Statistics.Servers)
             {
@@ -84,15 +84,23 @@ public static IEnumerable<DashboardMetric> GetMetrics()
             page =>
             {
                 long retryCount;
-                using (var connection = page.Storage.GetConnection())
+
+                if (page.Statistics.Retries.HasValue)
                 {
-                    var storageConnection = connection as JobStorageConnection;
-                    if (storageConnection == null)
+                    retryCount = page.Statistics.Retries.Value;
+                }
+                else
+                {
+                    using (var connection = page.Storage.GetConnection())
                     {
-                        return null;
-                    }
+                        var storageConnection = connection as JobStorageConnection;
+                        if (storageConnection == null)
+                        {
+                            return null;
+                        }
 
-                    retryCount = storageConnection.GetSetCount("retries");
+                        retryCount = storageConnection.GetSetCount("retries");
+                    }
                 }
 
                 return new Metric(retryCount)
@@ -190,5 +198,26 @@ public static IEnumerable<DashboardMetric> GetMetrics()
                     Style = awaitingCount > 0 ? MetricStyle.Info : MetricStyle.Default
                 };
             });
+        public static readonly DashboardMetric SuspendedCount = new DashboardMetric(
+          "suspended:count",
+          "Metrics_SuspendedCount",
+          page =>
+          {
+              long suspendedCount = -1;
+
+              using (var connection = page.Storage.GetConnection())
+              {
+                  var storageConnection = connection as JobStorageConnection;
+                  if (storageConnection != null)
+                  {
+                      suspendedCount = storageConnection.GetSetCount("paused-jobs");
+                  }
+              }
+
+              return new Metric(suspendedCount)
+              {
+                  Style = suspendedCount > 0 ? MetricStyle.Info : MetricStyle.Default
+              };
+          });
     }
 }

src/Hangfire.Core/Dashboard/DashboardRoutes.cs

@@ -176,6 +176,16 @@ static DashboardRoutes()
             Routes.AddRazorPage("/servers", x => new ServersPage());
             Routes.AddRazorPage("/retries", x => new RetriesPage());
 
+            Routes.AddRazorPage("/jobs/suspended", x => new SuspendedJobsPage());
+            Routes.AddRecurringBatchCommand(
+               "/recurring/suspend",
+               (manager, jobId) => manager.SuspendJob(jobId));
+
+            Routes.AddRecurringBatchCommand(
+              "/recurring/resume",
+              (manager, jobId) => manager.ResumeJob(jobId));
+
+
             #endregion
         }
 

src/Hangfire.Core/Dashboard/JobsSidebarMenu.cs

@@ -68,6 +68,12 @@ static JobsSidebarMenu()
                 Active = page.RequestPath.StartsWith("/jobs/awaiting"),
                 Metric = DashboardMetrics.AwaitingCount
             });
+            Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Suspended, page.Url.To("/jobs/suspended"))
+            {
+                Active = page.RequestPath.StartsWith("/jobs/suspended"),
+                Metric = DashboardMetrics.SuspendedCount
+            });
+
         }
     }
 }

src/Hangfire.Core/Dashboard/Pages/HomePage.cshtml

@@ -41,12 +41,14 @@
             </div>
         }
         <h3>@Strings.HomePage_RealtimeGraph</h3>
-        <canvas width="1140" height="250" id="realtimeGraph" data-succeeded="@Statistics.Succeeded" data-failed="@Statistics.Failed"
+        <canvas width="1140" height="250" id="realtimeGraph" data-succeeded="@Statistics.Succeeded" data-failed="@Statistics.Failed" data-deleted="@Statistics.Deleted"
              data-succeeded-string="@Strings.HomePage_GraphHover_Succeeded"
-             data-failed-string="@Strings.HomePage_GraphHover_Failed"></canvas>
+             data-failed-string="@Strings.HomePage_GraphHover_Failed"
+             data-deleted-string="@Strings.JobsSidebarMenu_Deleted"></canvas>
         <div style="display: none;">
             <span data-metric="succeeded:count"></span>
             <span data-metric="failed:count"></span>
+            <span data-metric="deleted:count"></span>
         </div>
 
         <h3>