diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl index f3a8b3f..b60633d 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl @@ -14,11 +14,17 @@ - - + + - - + + + + + + + + @@ -31,9 +37,13 @@ - - - + + + + + + + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd index 954b67a..e0b3476 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd @@ -13,15 +13,29 @@ - + - + - + + + + + + + + + + + + + + + @@ -33,7 +47,7 @@ - + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.GetJobHistoryGetJobHistoryResponse.datasource b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.GetJobHistoryGetJobHistoryResponse.datasource deleted file mode 100644 index 5844430..0000000 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.GetJobHistoryGetJobHistoryResponse.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - ECM.JobRunner.Common.JobRunnerReference.GetJobHistoryGetJobHistoryResponse, Connected Services.JobRunnerReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.GetJobStatusGetJobStatusResponse.datasource b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.GetJobStatusGetJobStatusResponse.datasource new file mode 100644 index 0000000..c97a588 --- /dev/null +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.GetJobStatusGetJobStatusResponse.datasource @@ -0,0 +1,10 @@ + + + + ECM.JobRunner.Common.JobRunnerReference.GetJobStatusGetJobStatusResponse, Connected Services.JobRunnerReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.UpdateJobUpdateJobResponse.datasource b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.UpdateJobUpdateJobResponse.datasource new file mode 100644 index 0000000..eb713ef --- /dev/null +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.UpdateJobUpdateJobResponse.datasource @@ -0,0 +1,10 @@ + + + + ECM.JobRunner.Common.JobRunnerReference.UpdateJobUpdateJobResponse, Connected Services.JobRunnerReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd index 633107e..ba385b7 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd @@ -1,5 +1,6 @@  - + + @@ -16,12 +17,25 @@ - + - + - + + + + + + + + + + + + + + @@ -41,6 +55,12 @@ + + + + + + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd index 1d037c6..463249c 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd @@ -1,16 +1,17 @@  - + - + + - + @@ -19,12 +20,35 @@ + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb index 4c22bd5..4baf8c0 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb @@ -15,80 +15,81 @@ Imports System Imports System.Runtime.Serialization Namespace JobRunnerReference - - _ + + Partial Public Class BaseBaseResponse Inherits Object Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ + + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - _ + + Private ErrorDetailsField As String - - _ + + Private ErrorMessageField As String - - _ + + Private OKField As Boolean - - _ + + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData Get Return Me.extensionDataField End Get Set - Me.extensionDataField = value + Me.extensionDataField = Value End Set End Property - - _ + + Public Property ErrorDetails() As String Get Return Me.ErrorDetailsField End Get Set - If (Object.ReferenceEquals(Me.ErrorDetailsField, value) <> true) Then - Me.ErrorDetailsField = value + If (Object.ReferenceEquals(Me.ErrorDetailsField, Value) <> True) Then + Me.ErrorDetailsField = Value Me.RaisePropertyChanged("ErrorDetails") End If End Set End Property - - _ + + Public Property ErrorMessage() As String Get Return Me.ErrorMessageField End Get Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value + If (Object.ReferenceEquals(Me.ErrorMessageField, Value) <> True) Then + Me.ErrorMessageField = Value Me.RaisePropertyChanged("ErrorMessage") End If End Set End Property - - _ + + Public Property OK() As Boolean Get Return Me.OKField End Get Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value + If (Me.OKField.Equals(Value) <> True) Then + Me.OKField = Value Me.RaisePropertyChanged("OK") End If End Set End Property - + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - + Protected Sub RaisePropertyChanged(ByVal propertyName As String) Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent If (Not (propertyChanged) Is Nothing) Then @@ -97,6 +98,14 @@ Namespace JobRunnerReference End Sub End Class + + Partial Public Class UpdateJobUpdateJobResponse + Inherits JobRunnerReference.BaseBaseResponse + End Class + - Partial Public Class GetJobHistoryGetJobHistoryResponse + Partial Public Class GetJobStatusGetJobStatusResponse Inherits JobRunnerReference.BaseBaseResponse - Private ItemsField() As JobRunnerReference.HistoryItem + Private HistoryItemsField() As JobRunnerReference.HistoryItem + + + Private StatusItemsField() As JobRunnerReference.StatusItem - Public Property Items() As JobRunnerReference.HistoryItem() + Public Property HistoryItems() As JobRunnerReference.HistoryItem() Get - Return Me.ItemsField + Return Me.HistoryItemsField End Get Set - If (Object.ReferenceEquals(Me.ItemsField, Value) <> True) Then - Me.ItemsField = Value - Me.RaisePropertyChanged("Items") + If (Object.ReferenceEquals(Me.HistoryItemsField, Value) <> True) Then + Me.HistoryItemsField = Value + Me.RaisePropertyChanged("HistoryItems") + End If + End Set + End Property + + + Public Property StatusItems() As JobRunnerReference.StatusItem() + Get + Return Me.StatusItemsField + End Get + Set + If (Object.ReferenceEquals(Me.StatusItemsField, Value) <> True) Then + Me.StatusItemsField = Value + Me.RaisePropertyChanged("StatusItems") End If End Set End Property @@ -272,6 +297,165 @@ Namespace JobRunnerReference End Sub End Class + + Partial Public Class StatusItem + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + + Private CompleteTimeField As Date + + + Private ExecutingField As Boolean + + + Private ExecutionTimeField As System.TimeSpan + + + Private IdField As String + + + Private NameField As String + + + Private ProgressCurrentField As Integer + + + Private ProgressTotalField As Integer + + + Private StartTimeField As Date + + + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = Value + End Set + End Property + + + Public Property CompleteTime() As Date + Get + Return Me.CompleteTimeField + End Get + Set + If (Me.CompleteTimeField.Equals(Value) <> True) Then + Me.CompleteTimeField = Value + Me.RaisePropertyChanged("CompleteTime") + End If + End Set + End Property + + + Public Property Executing() As Boolean + Get + Return Me.ExecutingField + End Get + Set + If (Me.ExecutingField.Equals(Value) <> True) Then + Me.ExecutingField = Value + Me.RaisePropertyChanged("Executing") + End If + End Set + End Property + + + Public Property ExecutionTime() As System.TimeSpan + Get + Return Me.ExecutionTimeField + End Get + Set + If (Me.ExecutionTimeField.Equals(Value) <> True) Then + Me.ExecutionTimeField = Value + Me.RaisePropertyChanged("ExecutionTime") + End If + End Set + End Property + + + Public Property Id() As String + Get + Return Me.IdField + End Get + Set + If (Object.ReferenceEquals(Me.IdField, Value) <> True) Then + Me.IdField = Value + Me.RaisePropertyChanged("Id") + End If + End Set + End Property + + + Public Property Name() As String + Get + Return Me.NameField + End Get + Set + If (Object.ReferenceEquals(Me.NameField, Value) <> True) Then + Me.NameField = Value + Me.RaisePropertyChanged("Name") + End If + End Set + End Property + + + Public Property ProgressCurrent() As Integer + Get + Return Me.ProgressCurrentField + End Get + Set + If (Me.ProgressCurrentField.Equals(Value) <> True) Then + Me.ProgressCurrentField = Value + Me.RaisePropertyChanged("ProgressCurrent") + End If + End Set + End Property + + + Public Property ProgressTotal() As Integer + Get + Return Me.ProgressTotalField + End Get + Set + If (Me.ProgressTotalField.Equals(Value) <> True) Then + Me.ProgressTotalField = Value + Me.RaisePropertyChanged("ProgressTotal") + End If + End Set + End Property + + + Public Property StartTime() As Date + Get + Return Me.StartTimeField + End Get + Set + If (Me.StartTimeField.Equals(Value) <> True) Then + Me.StartTimeField = Value + Me.RaisePropertyChanged("StartTime") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + End Class + + Partial Public Class UpdateJobUpdateJobRequest + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + + Private ActionField As JobRunnerReference.UpdateJobUpdateJobRequest.UpdateJobAction + + + Private JobField As JobRunnerReference.JobDefinition + + + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = Value + End Set + End Property + + + Public Property Action() As JobRunnerReference.UpdateJobUpdateJobRequest.UpdateJobAction + Get + Return Me.ActionField + End Get + Set + If (Me.ActionField.Equals(Value) <> True) Then + Me.ActionField = Value + Me.RaisePropertyChanged("Action") + End If + End Set + End Property + + + Public Property Job() As JobRunnerReference.JobDefinition + Get + Return Me.JobField + End Get + Set + If (Object.ReferenceEquals(Me.JobField, Value) <> True) Then + Me.JobField = Value + Me.RaisePropertyChanged("Job") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + + + Public Enum UpdateJobAction As Integer + + + Create = 0 + + + Update = 1 + + + Delete = 2 + End Enum + End Class + Public Interface IEDMIService @@ -488,11 +749,17 @@ Namespace JobRunnerReference Function GetHeartbeatAsync() As System.Threading.Tasks.Task(Of Date) - - Function GetJobHistory() As JobRunnerReference.GetJobHistoryGetJobHistoryResponse + + Function GetJobStatus() As JobRunnerReference.GetJobStatusGetJobStatusResponse - - Function GetJobHistoryAsync() As System.Threading.Tasks.Task(Of JobRunnerReference.GetJobHistoryGetJobHistoryResponse) + + Function GetJobStatusAsync() As System.Threading.Tasks.Task(Of JobRunnerReference.GetJobStatusGetJobStatusResponse) + + + Function UpdateJob(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As JobRunnerReference.UpdateJobUpdateJobResponse + + + Function UpdateJobAsync(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.UpdateJobUpdateJobResponse) Function GetJobConfig() As JobRunnerReference.GetJobConfigGetJobConfigResponse @@ -501,51 +768,59 @@ Namespace JobRunnerReference Function GetJobConfigAsync() As System.Threading.Tasks.Task(Of JobRunnerReference.GetJobConfigGetJobConfigResponse) End Interface - _ + Public Interface IEDMIServiceChannel Inherits JobRunnerReference.IEDMIService, System.ServiceModel.IClientChannel End Interface - - _ + + Partial Public Class EDMIServiceClient Inherits System.ServiceModel.ClientBase(Of JobRunnerReference.IEDMIService) Implements JobRunnerReference.IEDMIService - + Public Sub New() MyBase.New End Sub - + Public Sub New(ByVal endpointConfigurationName As String) MyBase.New(endpointConfigurationName) End Sub - + Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String) MyBase.New(endpointConfigurationName, remoteAddress) End Sub - + Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress) MyBase.New(endpointConfigurationName, remoteAddress) End Sub - + Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress) MyBase.New(binding, remoteAddress) End Sub - + Public Function GetHeartbeat() As Date Implements JobRunnerReference.IEDMIService.GetHeartbeat Return MyBase.Channel.GetHeartbeat End Function - + Public Function GetHeartbeatAsync() As System.Threading.Tasks.Task(Of Date) Implements JobRunnerReference.IEDMIService.GetHeartbeatAsync Return MyBase.Channel.GetHeartbeatAsync End Function - - Public Function GetJobHistory() As JobRunnerReference.GetJobHistoryGetJobHistoryResponse Implements JobRunnerReference.IEDMIService.GetJobHistory - Return MyBase.Channel.GetJobHistory + + Public Function GetJobStatus() As JobRunnerReference.GetJobStatusGetJobStatusResponse Implements JobRunnerReference.IEDMIService.GetJobStatus + Return MyBase.Channel.GetJobStatus + End Function + + Public Function GetJobStatusAsync() As System.Threading.Tasks.Task(Of JobRunnerReference.GetJobStatusGetJobStatusResponse) Implements JobRunnerReference.IEDMIService.GetJobStatusAsync + Return MyBase.Channel.GetJobStatusAsync End Function - Public Function GetJobHistoryAsync() As System.Threading.Tasks.Task(Of JobRunnerReference.GetJobHistoryGetJobHistoryResponse) Implements JobRunnerReference.IEDMIService.GetJobHistoryAsync - Return MyBase.Channel.GetJobHistoryAsync + Public Function UpdateJob(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As JobRunnerReference.UpdateJobUpdateJobResponse Implements JobRunnerReference.IEDMIService.UpdateJob + Return MyBase.Channel.UpdateJob(pData) + End Function + + Public Function UpdateJobAsync(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.UpdateJobUpdateJobResponse) Implements JobRunnerReference.IEDMIService.UpdateJobAsync + Return MyBase.Channel.UpdateJobAsync(pData) End Function Public Function GetJobConfig() As JobRunnerReference.GetJobConfigGetJobConfigResponse Implements JobRunnerReference.IEDMIService.GetJobConfig diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl index 85a9b1c..b4d0d27 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl @@ -50,8 +50,17 @@ - - + + + + + + + + + + + diff --git a/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj b/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj index b0ae436..76d76e4 100644 --- a/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj +++ b/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj @@ -74,6 +74,7 @@ + True @@ -107,7 +108,10 @@ Reference.svcmap - + + Reference.svcmap + + Reference.svcmap diff --git a/ECM.JobRunner.Common/JobStatus/StatusItem.vb b/ECM.JobRunner.Common/JobStatus/StatusItem.vb new file mode 100644 index 0000000..432a2d0 --- /dev/null +++ b/ECM.JobRunner.Common/JobStatus/StatusItem.vb @@ -0,0 +1,14 @@ +Public Class StatusItem + Public Const PROGRESS_CURRENT = "__Progress_Current" + Public Const PROGRESS_TOTAL = "__Progress_Total" + + Public Id As String + Public Name As String + Public ExecutionTime As TimeSpan + Public ProgressCurrent As Integer + Public ProgressTotal As Integer + Public Executing As Boolean = False + + Public StartTime As Date + Public CompleteTime As Date +End Class diff --git a/ECM.JobRunner.Web/Components/Job/JobForm.razor b/ECM.JobRunner.Web/Components/Job/JobForm.razor new file mode 100644 index 0000000..66ff5ae --- /dev/null +++ b/ECM.JobRunner.Web/Components/Job/JobForm.razor @@ -0,0 +1,89 @@ +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Data; +@inject JobService Jobs; + +@if (job == null) +{ +

Form loading..

+} +else +{ + + + + +
+ + +
Die Datenbank Id des Jobs.
+
+
+ + +
Der Name des Jobs. Wird in der Übersicht angezeigt.
+
+
+ + +
Die Zeitplan des Jobs. Erwartet eine Quartz.NET Cron Expression.
+
+ +
+ + +
Der Typ des Jobs.
+
+ +
+ + +
+ +
+ + + + Back + + +
+ +} + +@code { + [Parameter] + public int JobId { get; set; } + + [Parameter] + public EventCallback OnValidSubmit { get; set; } + + private JobDefinition? job = new(); + private List? types; + + protected override async Task OnInitializedAsync() + { + types = await Jobs.GetJobTypes(); + + if (JobId == Constants.ENTITY_ID_NEW) + { + job = new JobDefinition() { Id = Constants.ENTITY_ID_NEW }; + } + else + { + job = await Jobs.GetJob(JobId); + } + } +} diff --git a/ECM.JobRunner.Web/Components/Status/JobStatus.razor b/ECM.JobRunner.Web/Components/Status/JobStatus.razor new file mode 100644 index 0000000..6b8c8b0 --- /dev/null +++ b/ECM.JobRunner.Web/Components/Status/JobStatus.razor @@ -0,0 +1,5 @@ +

JobStatus

+ +@code { + +} diff --git a/ECM.JobRunner.Web/Components/Status/Progress.razor b/ECM.JobRunner.Web/Components/Status/Progress.razor new file mode 100644 index 0000000..2c1feb6 --- /dev/null +++ b/ECM.JobRunner.Web/Components/Status/Progress.razor @@ -0,0 +1,29 @@ +@using ECM.JobRunner.Common.JobRunnerReference; + +
+
+
+ +@code { + [Parameter] + public StatusItem? jobStatus { get; set; } + + protected float getCompletedPercent(StatusItem? entry) + { + if (entry != null && entry.ProgressCurrent > 0 && entry.ProgressTotal > 0) + { + return ((float)entry.ProgressCurrent / (float)entry.ProgressTotal) * 100; + } + else + { + return 0; + } + } +} diff --git a/ECM.JobRunner.Web/Constants.cs b/ECM.JobRunner.Web/Constants.cs new file mode 100644 index 0000000..fe5ffe1 --- /dev/null +++ b/ECM.JobRunner.Web/Constants.cs @@ -0,0 +1,7 @@ +namespace ECM.JobRunner.Web +{ + public class Constants + { + public const int ENTITY_ID_NEW = -1; + } +} diff --git a/ECM.JobRunner.Web/Data/ApiService.cs b/ECM.JobRunner.Web/Data/ApiService.cs deleted file mode 100644 index 89be948..0000000 --- a/ECM.JobRunner.Web/Data/ApiService.cs +++ /dev/null @@ -1,92 +0,0 @@ -using DigitalData.Modules.Messaging.WCF; -using ECM.JobRunner.Common; - -namespace ECM.JobRunner.Web.Data -{ - public class ApiService - { - private readonly Channel channelManager; - private readonly Common.JobRunnerReference.IEDMIServiceChannel channel; - private ServerAddress address; - - private System.Timers.Timer pollingTimer = new(); - - public event EventHandler DataUpdated; - - public ApiService(LoggingService Logging, WcfService Wcf) - { - channel = Wcf.Channel; - - pollingTimer.Elapsed += PollingTimer_Elapsed; - pollingTimer.Interval = 1000; - pollingTimer.Start(); - } - - protected virtual void OnDataUpdated(ApiStatusResponse e) - { - EventHandler handler = DataUpdated; - if (handler != null) - { - handler(this, e); - } - } - - private async void PollingTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) - { - OnDataUpdated(await GetData()); - } - - public async Task?> GetJobList() - { - var resp = await channel.GetJobConfigAsync(); - - if (resp != null && resp.OK) - { - return resp.JobDefinitions.ToList(); - } - else - { - return null; - } - } - - public async Task GetData() - { - DateTime heartbeat = await GetHeartbeat(); - List jobHistory = await GetHistoryEntries(); - - return new ApiStatusResponse() - { - heartbeat = heartbeat, - jobHistory = jobHistory.OrderByDescending(e => e.CreatedAt).Take(10).ToList() - }; - } - - private async Task GetHeartbeat() - { - return await channel.GetHeartbeatAsync(); - } - - private async Task> GetHistoryEntries() - { - try - { - var oResponse = await channel.GetJobHistoryAsync(); - - if (oResponse.OK) - { - return oResponse.Items.ToList(); - } - else - { - return new(); - } - } - catch (Exception) - { - throw; - } - - } - } -} diff --git a/ECM.JobRunner.Web/Data/ApiStatusResponse.cs b/ECM.JobRunner.Web/Data/DashboardResponse.cs similarity index 70% rename from ECM.JobRunner.Web/Data/ApiStatusResponse.cs rename to ECM.JobRunner.Web/Data/DashboardResponse.cs index 419a618..72c2c7e 100644 --- a/ECM.JobRunner.Web/Data/ApiStatusResponse.cs +++ b/ECM.JobRunner.Web/Data/DashboardResponse.cs @@ -2,9 +2,10 @@ namespace ECM.JobRunner.Web.Data { - public class ApiStatusResponse + public class DashboardResponse { public DateTime heartbeat = DateTime.MinValue; public List jobHistory = new(); + public List jobStatus = new(); } } diff --git a/ECM.JobRunner.Web/Data/DashboardService.cs b/ECM.JobRunner.Web/Data/DashboardService.cs new file mode 100644 index 0000000..0792562 --- /dev/null +++ b/ECM.JobRunner.Web/Data/DashboardService.cs @@ -0,0 +1,107 @@ +using DigitalData.Modules.Logging; +using DigitalData.Modules.Messaging.WCF; +using ECM.JobRunner.Common; + +namespace ECM.JobRunner.Web.Data +{ + public class DashboardService + { + private readonly Common.JobRunnerReference.IEDMIServiceChannel channel; + private Logger logger; + + private System.Timers.Timer pollingTimer = new(); + + public event EventHandler DataUpdated; + + public DashboardService(LoggingService Logging, WcfService Wcf) + { + logger = Logging.LogConfig.GetLogger(); + channel = Wcf.Channel; + + pollingTimer.Elapsed += PollingTimer_Elapsed; + pollingTimer.Interval = 1000; + pollingTimer.Start(); + } + + protected virtual void OnDataUpdated(DashboardResponse e) + { + EventHandler handler = DataUpdated; + if (handler != null) + { + handler(this, e); + } + } + + private async void PollingTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) + { + OnDataUpdated(await GetData()); + } + + + + public async Task GetData() + { + DateTime heartbeat = await GetHeartbeat(); + List jobHistory = await GetHistoryItems(); + List jobStatus = await GetStatusItems(); + + return new DashboardResponse() + { + heartbeat = heartbeat, + jobHistory = jobHistory.OrderByDescending(e => e.CreatedAt).Take(10).ToList(), + jobStatus = jobStatus.OrderByDescending(e => e.StartTime).Take(10).ToList() + }; + } + + private async Task GetHeartbeat() + { + return await channel.GetHeartbeatAsync(); + } + + private async Task> GetHistoryItems() + { + try + { + var oResponse = await channel.GetJobStatusAsync(); + + if (oResponse.OK) + { + return oResponse.HistoryItems.ToList(); + } + else + { + return new(); + } + } + catch (Exception e) + { + logger.Error(e); + return new(); + } + + } + + private async Task> GetStatusItems() + { + try + { + var oResponse = await channel.GetJobStatusAsync(); + + if (oResponse.OK) + { + return oResponse.StatusItems.ToList(); + } + else + { + return new(); + } + } + catch (Exception e) + { + logger.Error(e); + return new(); + } + + } + } +} diff --git a/ECM.JobRunner.Web/Data/JobService.cs b/ECM.JobRunner.Web/Data/JobService.cs new file mode 100644 index 0000000..ed51e47 --- /dev/null +++ b/ECM.JobRunner.Web/Data/JobService.cs @@ -0,0 +1,138 @@ +using DigitalData.Modules.Logging; +using ECM.JobRunner.Common.JobRunnerReference; +using System.Threading.Channels; + +namespace ECM.JobRunner.Web.Data +{ + public class JobService + { + private readonly Logger logger; + private readonly Common.JobRunnerReference.IEDMIServiceChannel channel; + + public JobService(LoggingService Logging, WcfService Wcf) + { + logger = Logging.LogConfig.GetLogger(); + channel = Wcf.Channel; + } + + public async Task> GetJobs() + { + var resp = await channel.GetJobConfigAsync(); + + if (resp != null && resp.OK) + { + return resp.JobDefinitions.ToList(); + } + else + { + return new(); + } + } + + public async Task> GetJobTypes() + { + var resp = await channel.GetJobConfigAsync(); + + if (resp != null && resp.OK) + { + return resp.JobTypes.ToList(); + } + else + { + return new(); + } + } + + public async Task GetJob(int pJobId) + { + var resp = await channel.GetJobConfigAsync(); + + if (resp != null && resp.OK) + { + return resp.JobDefinitions. + Where(j => j.Id == pJobId). + FirstOrDefault(); + } + else + { + return null; + } + } + + public async Task UpdateJob(JobDefinition job) + { + var resp = await channel.UpdateJobAsync(new UpdateJobUpdateJobRequest { + Job = job, + Action = UpdateJobUpdateJobRequest.UpdateJobAction.Update + }); + + if (resp != null && resp.OK) + { + return true; + } + else + { + return false; + } + } + + public async Task CreateJob(JobDefinition job) + { + var resp = await channel.UpdateJobAsync(new UpdateJobUpdateJobRequest + { + Job = job, + Action = UpdateJobUpdateJobRequest.UpdateJobAction.Create + }); + + if (resp != null && resp.OK) + { + return true; + } + else + { + return false; + } + } + + public async Task DeleteJob(JobDefinition job) + { + var resp = await channel.UpdateJobAsync(new UpdateJobUpdateJobRequest + { + Job = job, + Action = UpdateJobUpdateJobRequest.UpdateJobAction.Delete + }); + + if (resp != null && resp.OK) + { + return true; + } + else + { + return false; + } + } + + public DateTime GetNextExecutionTime(string pCronExpression) + { + Quartz.CronExpression expression = new(pCronExpression); + + if (expression != null) + { + var next = expression.GetNextValidTimeAfter(DateTimeOffset.Now); + + if (next != null) + { + return ((DateTimeOffset)next).DateTime; + } + else + { + return DateTime.MinValue; + } + } + else + { + return DateTime.MinValue; + } + } + } +} diff --git a/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj b/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj index 50df0da..f7cb108 100644 --- a/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj +++ b/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj @@ -8,6 +8,7 @@ + diff --git a/ECM.JobRunner.Web/Pages/History.razor b/ECM.JobRunner.Web/Pages/History.razor index 4058f74..7c6cb0f 100644 --- a/ECM.JobRunner.Web/Pages/History.razor +++ b/ECM.JobRunner.Web/Pages/History.razor @@ -1,7 +1,7 @@ @page "/history" @using ECM.JobRunner.Common.JobRunnerReference; @using ECM.JobRunner.Web.Data; -@inject ApiService Api +@inject DashboardService Api History @@ -41,18 +41,18 @@ else protected async override void OnInitialized() { - ApiStatusResponse data = await Api.GetData(); + DashboardResponse data = await Api.GetData(); UpdateData(data); Api.DataUpdated += Api_DataUpdated; } - protected void Api_DataUpdated(object sender, ApiStatusResponse e) + protected void Api_DataUpdated(object sender, DashboardResponse e) { UpdateData(e); } - protected void UpdateData(ApiStatusResponse response) + protected void UpdateData(DashboardResponse response) { today = response.heartbeat; historyEntries = response.jobHistory; diff --git a/ECM.JobRunner.Web/Pages/Job/EditJob.razor b/ECM.JobRunner.Web/Pages/Job/EditJob.razor new file mode 100644 index 0000000..1be0e08 --- /dev/null +++ b/ECM.JobRunner.Web/Pages/Job/EditJob.razor @@ -0,0 +1,28 @@ +@page "/jobs/{jobId:int}/edit" +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Data; +@using ECM.JobRunner.Web.Components.Job; +@inject NavigationManager Navigation; +@inject JobService Jobs; + +Job bearbeiten + +

Job bearbeiten

+ + + +@code { + [Parameter] + public int JobId { get; set; } + + private async void OnFormSubmit(EditContext ctx) + { + JobDefinition job = (JobDefinition)ctx.Model; + bool result = await Jobs.UpdateJob(job); + + if (result == true) + { + Navigation.NavigateTo($"/jobs/{job.Id}"); + } + } +} diff --git a/ECM.JobRunner.Web/Pages/Job/JobList.razor b/ECM.JobRunner.Web/Pages/Job/JobList.razor new file mode 100644 index 0000000..6dc4ccb --- /dev/null +++ b/ECM.JobRunner.Web/Pages/Job/JobList.razor @@ -0,0 +1,76 @@ +@page "/jobs" +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Data; +@inject JobService Jobs + +Jobs + +

Jobs

+ +@if (jobs == null) +{ +
    +
  • Loading Jobs..
    • +
+} +else +{ +
+ @foreach (var job in jobs) + { + +
+
+ + @if (job.Active) + { + + + + + } + else + { + + + + + } + + @job.Name +
+ @job.Type.Name +
+ + @if (job.Active) + { + Running + } + else + { + Stopped + } + + + } +
+ +
+ + + + + New + +
+} + +@code { + private List? jobs; + + protected async override void OnInitialized() + { + jobs = await Jobs.GetJobs(); + StateHasChanged(); + } +} \ No newline at end of file diff --git a/ECM.JobRunner.Web/Pages/JobPage.razor b/ECM.JobRunner.Web/Pages/Job/JobPage.razor similarity index 88% rename from ECM.JobRunner.Web/Pages/JobPage.razor rename to ECM.JobRunner.Web/Pages/Job/JobPage.razor index 0a91548..5cf602f 100644 --- a/ECM.JobRunner.Web/Pages/JobPage.razor +++ b/ECM.JobRunner.Web/Pages/Job/JobPage.razor @@ -1,7 +1,10 @@ @page "/jobs/{jobId:int}" @using ECM.JobRunner.Common.JobRunnerReference; @using ECM.JobRunner.Web.Data; -@inject ApiService Api + +@inject NavigationManager Navigation; +@inject IJSRuntime JsRuntime +@inject JobService Jobs Job @@ -49,7 +52,7 @@ else Next Run at - @DateTime.Now.AddMinutes(5) + @nextExecution @@ -66,7 +69,7 @@ else Edit - + Delete @@ -79,15 +82,31 @@ else public int JobId { get; set; } private JobDefinition? job; + private DateTime nextExecution; protected async override void OnInitialized() { - var jobs = await Api.GetJobList(); + job = await Jobs.GetJob(JobId); - if (jobs != null) - { - job = jobs.Where(j => j.Id == JobId).SingleOrDefault(); + if (job != null) + { + nextExecution = Jobs.GetNextExecutionTime(job.CronSchedule); StateHasChanged(); } } + + protected async void DeleteJob() + { + if (job != null) + { + bool confirmed = await JsRuntime.InvokeAsync("confirm", "Are you sure?"); + if (confirmed) + { + await Jobs.DeleteJob(job); + Navigation.NavigateTo($"/jobs"); + } + } + } + + } \ No newline at end of file diff --git a/ECM.JobRunner.Web/Pages/Job/NewJob.razor b/ECM.JobRunner.Web/Pages/Job/NewJob.razor new file mode 100644 index 0000000..43f371e --- /dev/null +++ b/ECM.JobRunner.Web/Pages/Job/NewJob.razor @@ -0,0 +1,28 @@ +@page "/jobs/new" +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Data; +@using ECM.JobRunner.Web.Components.Job; +@inject NavigationManager Navigation; +@inject JobService Jobs; + +Job erstellen + +

Job erstellen

+ + + +@code { + public int JobId = -1; + + private async void OnFormSubmit(EditContext ctx) + { + JobDefinition job = (JobDefinition)ctx.Model; + + bool result = await Jobs.CreateJob(job); + + if (result == true) + { + Navigation.NavigateTo($"/jobs"); + } + } +} diff --git a/ECM.JobRunner.Web/Pages/JobForm.razor b/ECM.JobRunner.Web/Pages/JobForm.razor deleted file mode 100644 index 883ad3b..0000000 --- a/ECM.JobRunner.Web/Pages/JobForm.razor +++ /dev/null @@ -1,5 +0,0 @@ -

JobForm

- -@code { - -} diff --git a/ECM.JobRunner.Web/Pages/JobList.razor b/ECM.JobRunner.Web/Pages/JobList.razor deleted file mode 100644 index ca08a65..0000000 --- a/ECM.JobRunner.Web/Pages/JobList.razor +++ /dev/null @@ -1,42 +0,0 @@ -@page "/jobs" -@using ECM.JobRunner.Common.JobRunnerReference; -@using ECM.JobRunner.Web.Data; -@inject ApiService Api - -Jobs - -

Jobs

- -@if (jobList == null) -{ -
    -
  • Loading Jobs..
    • -
-} -else -{ -
- @foreach (var job in jobList) - { - -
-
- @job.Name -
- @job.Type.Name -
- Now - - } -
-} - -@code { - private List? jobList; - - protected async override void OnInitialized() - { - jobList = await Api.GetJobList(); - StateHasChanged(); - } -} \ No newline at end of file diff --git a/ECM.JobRunner.Web/Pages/NewJob.razor b/ECM.JobRunner.Web/Pages/NewJob.razor deleted file mode 100644 index 6ccc168..0000000 --- a/ECM.JobRunner.Web/Pages/NewJob.razor +++ /dev/null @@ -1,7 +0,0 @@ -New Job - -

New Job

- -@code { - -} diff --git a/ECM.JobRunner.Web/Pages/Status.razor b/ECM.JobRunner.Web/Pages/Status.razor new file mode 100644 index 0000000..ff2d80c --- /dev/null +++ b/ECM.JobRunner.Web/Pages/Status.razor @@ -0,0 +1,135 @@ +@page "/status" +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Components.Status; +@using ECM.JobRunner.Web.Data; +@inject DashboardService Api + +Status + +

Job Status

+ +
+ @if (executingEntries == null) + { +

Executing

+ +
    +
  • Loading Job Status..
    • +
+ } + else if (executingEntries.Count == 0) + { +

Executing

+
    +
  • No jobs currently executing
    • +
+ } + else + { +

Executing (@executingEntries.Count)

+ +
    + @foreach (var entry in executingEntries) + { +
  • +
    +
    +
    + + + + + @entry.Name +
    + +
    + Started @entry.StartTime.ToLongTimeString() +
    + +
    • + } +
+ } + +
+ +@if (completedEntries == null) +{ +

Completed

+ +
    +
  • Loading Job Status..
    • +
+} +else if (completedEntries.Count == 0) +{ +

Completed

+ +
    +
  • No jobs currently executing
    • +
+} +else +{ +

Completed (@completedEntries.Count)

+ +
    + @foreach (var entry in completedEntries) + { +
  • +
    +
    + + + + + @entry.Name +
    +
      +
    • Execution Time: @((int)entry.ExecutionTime.TotalSeconds)s
      • +
    • Started: @entry.StartTime.ToLongTimeString()
      • +
    • Completed: @entry.CompleteTime.ToLongTimeString()
      • +
    +
    + Completed @entry.CompleteTime.ToLongTimeString() +
    • + } +
+} + + +@code { + private DateTime today; + private List? executingEntries; + private List? completedEntries; + + protected async override void OnInitialized() + { + DashboardResponse data = await Api.GetData(); + UpdateData(data); + + Api.DataUpdated += Api_DataUpdated; + } + + protected void Api_DataUpdated(object sender, DashboardResponse e) + { + UpdateData(e); + } + + protected void UpdateData(DashboardResponse response) + { + today = response.heartbeat; + + executingEntries = response.jobStatus. + Where(s => s.ProgressTotal > 0). + Where(s => s.Executing). + ToList(); + + completedEntries = response.jobStatus. + Where(s => !s.Executing). + Where(s => s.StartTime.AddMinutes(1) > DateTime.Now). + ToList(); + + InvokeAsync(StateHasChanged); + } +} diff --git a/ECM.JobRunner.Web/Program.cs b/ECM.JobRunner.Web/Program.cs index 57bacea..3e6e5c8 100644 --- a/ECM.JobRunner.Web/Program.cs +++ b/ECM.JobRunner.Web/Program.cs @@ -11,7 +11,8 @@ builder.Services.AddServerSideBlazor(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddSingleton(); -builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); var app = builder.Build(); diff --git a/ECM.JobRunner.Web/Shared/NavMenu.razor b/ECM.JobRunner.Web/Shared/NavMenu.razor index 869b555..9099d9a 100644 --- a/ECM.JobRunner.Web/Shared/NavMenu.razor +++ b/ECM.JobRunner.Web/Shared/NavMenu.razor @@ -24,6 +24,14 @@ Jobs +
+ + + + + Status + +
diff --git a/ECM.JobRunner.Windows/Constants.vb b/ECM.JobRunner.Windows/Constants.vb index dfcf224..99f5712 100644 --- a/ECM.JobRunner.Windows/Constants.vb +++ b/ECM.JobRunner.Windows/Constants.vb @@ -3,8 +3,9 @@ Public Const SERVICE_DISPLAY_NAME As String = "Digital Data ECM JobRunner Service" Public Class Scheduler - Public Const JOB_CONFIG_LOGCONFIG = "LogConfig" - Public Const JOB_CONFIG_ARGUMENTS = "Arguments" - Public Const JOB_CONFIG_DATABASE = "Database" + Public Const JOB_CONFIG_LOGCONFIG = "__LogConfig" + Public Const JOB_CONFIG_ARGUMENTS = "__Arguments" + Public Const JOB_CONFIG_DATABASE = "__Database" + Public Const JOB_CONFIG_STATE = "__State" End Class End Class diff --git a/ECM.JobRunner.Windows/ECM.JobRunner.Windows.vbproj b/ECM.JobRunner.Windows/ECM.JobRunner.Windows.vbproj index ef9a8f6..ebe74de 100644 --- a/ECM.JobRunner.Windows/ECM.JobRunner.Windows.vbproj +++ b/ECM.JobRunner.Windows/ECM.JobRunner.Windows.vbproj @@ -129,6 +129,7 @@ + @@ -155,7 +156,8 @@ - + + diff --git a/ECM.JobRunner.Windows/Scheduler/JobScheduler.vb b/ECM.JobRunner.Windows/Scheduler/JobScheduler.vb index 8e0e65c..7228379 100644 --- a/ECM.JobRunner.Windows/Scheduler/JobScheduler.vb +++ b/ECM.JobRunner.Windows/Scheduler/JobScheduler.vb @@ -1,9 +1,8 @@ Imports System.Collections.Specialized -Imports System.Threading Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging +Imports ECM.JobRunner.Common Imports Quartz -Imports Quartz.Logging.OperationName Namespace Scheduler Public Class JobScheduler @@ -44,44 +43,7 @@ Namespace Scheduler Await Scheduler.Start() ' load job Config and setup job schedules - - Logger.Info("Loading [{0}] Job Definitions..", State.JobDefinitions.Count) - - For Each oJob In State.JobDefinitions - Logger.Debug("Loading Job Definition [{0}]", oJob.Name) - - Select Case oJob.TypeId - Case JOB_TYPE_IMPORT - Await ScheduleJob(Of Jobs.FileImportJob)(New JobConfig With { - .Name = oJob.Name, - .Enabled = True, - .Arguments = New Dictionary(Of String, String) From { - {"Name", oJob.Name} - }, - .CronSchedule = oJob.CronSchedule - }) - - Case JOB_TYPE_INDEX - Await ScheduleJob(Of Jobs.FileIndexJob)(New JobConfig With { - .Name = oJob.Name, - .Enabled = True, - .Arguments = New Dictionary(Of String, String) From { - {"Name", oJob.Name} - }, - .CronSchedule = oJob.CronSchedule - }) - - End Select - Next - - ' setup debug job - - Await ScheduleJob(Of Jobs.DebugJob)(New JobConfig With { - .Name = "Debug Job", - .Enabled = True, - .Arguments = New Dictionary(Of String, String) From {{"Arg1", "My awesome argument"}}, - .CronSchedule = "0 * * * * ?" - }) + ScheduleJobs() Return True Catch ex As Exception @@ -91,57 +53,141 @@ Namespace Scheduler End Try End Function + Public Sub Reload() + ' first reload the data from db + State.Reload() + + ' now reschedule jobs + ScheduleJobs() + End Sub + Public Async Function Shutdown() As Task Await Scheduler.Shutdown() End Function - Public Async Function ScheduleJob(Of T As IJob)(pJobConfig As JobConfig) As Task - Dim oJobName As String = pJobConfig.Name - Dim oTriggerName As String = $"{oJobName}-TRIGGER" + Public Async Function GetRunningJobs() As Task(Of IReadOnlyCollection(Of IJobExecutionContext)) + Return Await Scheduler.GetCurrentlyExecutingJobs() + End Function - pJobConfig.Name = oJobName + Private Async Sub ScheduleJobs() - Dim oJobData As New JobDataMap From { - {Constants.Scheduler.JOB_CONFIG_LOGCONFIG, LogConfig}, - {Constants.Scheduler.JOB_CONFIG_ARGUMENTS, pJobConfig.Arguments}, - {Constants.Scheduler.JOB_CONFIG_DATABASE, Database} + Logger.Info("Loading [{0}] Job Definitions..", State.JobDefinitions.Count) + + For Each oJob In State.JobDefinitions + Logger.Debug("Loading Job Definition [{0}]", oJob.Name) + Logger.Debug("Job Type is [{0}]", oJob.Type.Name) + + Select Case oJob.TypeId + Case JOB_TYPE_IMPORT + Dim oJobConfig = BuildJobConfig(Of Jobs.FileImportJob)(oJob) + Await ScheduleJob(Of Jobs.FileImportJob)(oJobConfig) + + Case JOB_TYPE_INDEX + Dim oJobConfig = BuildJobConfig(Of Jobs.FileIndexJob)(oJob) + Await ScheduleJob(Of Jobs.FileIndexJob)(oJobConfig) + + Case Else + Logger.Warn("Job for TypeId [{0}] is not implemented!", oJob.TypeId) + End Select + Next + End Sub + + Private Function BuildJobConfig(Of TJob As IJob)(pJob As JobDefinition) As JobConfig + Return New JobConfig With { + .Name = pJob.Name, + .Enabled = pJob.Active, + .Arguments = New Dictionary(Of String, String) From { + {"Name", pJob.Name} + }, + .CronSchedule = pJob.CronSchedule } + End Function - Dim oJob = JobBuilder.Create(Of T)(). - WithIdentity(oJobName). - UsingJobData(oJobData). - Build() + Private Async Function ScheduleJob(Of T As IJob)(pJobConfig As JobConfig) As Task + If Await Scheduler.CheckExists(New JobKey(GetJobName(pJobConfig))) Then + Logger.Debug("Job already exists, rescheduling..") + Await DoRescheduleJob(Of T)(pJobConfig) + Else + Logger.Debug("Job does not exist, scheduling..") + Await DoScheduleJob(Of T)(pJobConfig) + End If + End Function - Dim oTrigger = TriggerBuilder.Create(). - WithIdentity(oTriggerName). - StartNow(). - WithCronSchedule(pJobConfig.CronSchedule). - Build() + ''' + ''' Updates the Trigger and Schedule for a given JobConfig + ''' + ''' + ''' + ''' + Private Async Function DoRescheduleJob(Of T As IJob)(pJobConfig As JobConfig) As Task + Dim oJobKey As New JobKey(pJobConfig.Name) + Dim oTriggerKey As New TriggerKey(GetTriggerName(pJobConfig)) + Dim oTrigger = BuildTrigger(pJobConfig) + + Await Scheduler.RescheduleJob(oTriggerKey, oTrigger) + End Function + + Private Async Function DoScheduleJob(Of T As IJob)(pJobConfig As JobConfig) As Task + Dim oJobName As String = GetJobName(pJobConfig) + Dim oTriggerName As String = GetTriggerName(pJobConfig) + + Dim oJobData As JobDataMap = BuildJobData(pJobConfig) + Dim oJob As IJobDetail = BuildJob(Of T)(pJobConfig, oJobData) + Dim oTrigger As ITrigger = BuildTrigger(pJobConfig) If pJobConfig.Enabled Then Await Scheduler.ScheduleJob(oJob, oTrigger) - Logger.Info("Job {0} scheduled.", oJobName) + Logger.Info("Job [{0}] scheduled.", oJobName) Else - Logger.Info("Job {0} is disabled.", oJobName) + Logger.Info("Job [{0}] is disabled.", oJobName) End If If pJobConfig.StartWithoutDelay Then - Dim oDebugJob = JobBuilder.Create(Of T)(). - WithIdentity(oJobName & "-DEBUG"). - UsingJobData(oJobData). - Build() - - Dim oDebugTrigger = TriggerBuilder.Create(). - WithIdentity(oTriggerName & "-DEBUG"). + Dim oNoDelayTrigger = TriggerBuilder.Create(). + WithIdentity(oTriggerName & "-NO-DELAY"). StartAt(DateBuilder.FutureDate(10, IntervalUnit.Second)). Build() Logger.Info("Job {0} will start in 10 Seconds.", oJobName) - Await Scheduler.ScheduleJob(oDebugJob, oDebugTrigger) + Await Scheduler.ScheduleJob(oJob, oNoDelayTrigger) End If End Function + Private Function BuildJobData(pJobConfig As JobConfig) As JobDataMap + Return New JobDataMap From { + {Constants.Scheduler.JOB_CONFIG_LOGCONFIG, LogConfig}, + {Constants.Scheduler.JOB_CONFIG_ARGUMENTS, pJobConfig.Arguments}, + {Constants.Scheduler.JOB_CONFIG_DATABASE, Database}, + {Constants.Scheduler.JOB_CONFIG_STATE, State} + } + End Function + + Private Function BuildJob(Of T As IJob)(pJobConfig As JobConfig, pJobData As JobDataMap) As IJobDetail + Dim oJobName = GetJobName(pJobConfig) + Return JobBuilder.Create(Of T)(). + WithIdentity(pJobConfig.Name). + UsingJobData(pJobData). + Build() + End Function + + Private Function BuildTrigger(pJobConfig As JobConfig) As ITrigger + Dim oTriggerName As String = GetTriggerName(pJobConfig) + Return TriggerBuilder.Create(). + WithIdentity(oTriggerName). + WithCronSchedule(pJobConfig.CronSchedule). + StartNow(). + Build() + End Function + + Private Function GetJobName(pJobConfig As JobConfig) As String + Return pJobConfig.Name + End Function + + Private Function GetTriggerName(pJobConfig As JobConfig) As String + Dim oJobName As String = pJobConfig.Name + Return $"{oJobName}-TRIGGER" + End Function End Class End Namespace diff --git a/ECM.JobRunner.Windows/Scheduler/JobStatus.vb b/ECM.JobRunner.Windows/Scheduler/JobStatus.vb new file mode 100644 index 0000000..ca050ab --- /dev/null +++ b/ECM.JobRunner.Windows/Scheduler/JobStatus.vb @@ -0,0 +1,65 @@ +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Logging +Imports ECM.JobRunner.Common + +Public Class JobStatus + Inherits BaseClass + + Public ReadOnly Entries As New List(Of StatusItem) + + Public Sub New(pLogConfig As LogConfig) + MyBase.New(pLogConfig) + End Sub + + Public Sub Start(pJob As Quartz.IJobExecutionContext) + Dim oStatus = GetJobStatus(pJob) + + Logger.Info("Starting Job [{0}]", oStatus.Id) + + If oStatus IsNot Nothing Then + oStatus.Name = pJob.JobDetail.Key.Name + oStatus.StartTime = Date.Now + oStatus.Executing = True + End If + End Sub + + Public Sub Update(pJob As Quartz.IJobExecutionContext, pCurrent As Integer, pTotal As Integer) + Dim oStatus = GetJobStatus(pJob) + + Logger.Debug("Updating Job [{0}] with Status [{1}/{2}]", oStatus.Id, pCurrent, pTotal) + + If oStatus IsNot Nothing Then + oStatus.ProgressTotal = pTotal + oStatus.ProgressCurrent = pCurrent + oStatus.ExecutionTime = pJob.JobRunTime + End If + End Sub + + Public Sub Complete(pJob As Quartz.IJobExecutionContext) + Dim oStatus = GetJobStatus(pJob) + + Logger.Info("Completing Job [{0}]", oStatus.Id) + + If oStatus IsNot Nothing Then + oStatus.ProgressCurrent = oStatus.ProgressTotal + oStatus.ExecutionTime = pJob.JobRunTime + oStatus.Executing = False + oStatus.CompleteTime = Date.Now + End If + End Sub + + Private Function GetJobStatus(pJob As Quartz.IJobExecutionContext) As StatusItem + Dim oJobId = GetJobId(pJob) + Dim oExists = Entries.Where(Function(e) e.Id = oJobId).Any() + + If Not oExists Then + Entries.Add(New StatusItem With {.Id = oJobId}) + End If + + Return Entries.Where(Function(e) e.Id = oJobId).SingleOrDefault() + End Function + + Private Function GetJobId(pJob As Quartz.IJobExecutionContext) As String + Return pJob.JobDetail.Key.ToString() & pJob.FireTimeUtc.ToString("u") + End Function +End Class diff --git a/ECM.JobRunner.Windows/Scheduler/Jobs/BaseJob.vb b/ECM.JobRunner.Windows/Scheduler/Jobs/BaseJob.vb index 814aa0e..55c175c 100644 --- a/ECM.JobRunner.Windows/Scheduler/Jobs/BaseJob.vb +++ b/ECM.JobRunner.Windows/Scheduler/Jobs/BaseJob.vb @@ -1,5 +1,6 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging +Imports ECM.JobRunner.Common Imports Quartz Namespace Scheduler.Jobs @@ -7,15 +8,30 @@ Namespace Scheduler.Jobs Friend LogConfig As LogConfig Friend Logger As Logger Friend Database As MSSQLServer + Friend State As State + + Private ctx As IJobExecutionContext Public Function InitializeJob(context As IJobExecutionContext) As Dictionary(Of String, String) + ctx = context + Dim oJobData = context.MergedJobDataMap LogConfig = oJobData.Item(Constants.Scheduler.JOB_CONFIG_LOGCONFIG) Database = oJobData.Item(Constants.Scheduler.JOB_CONFIG_DATABASE) + State = oJobData.Item(Constants.Scheduler.JOB_CONFIG_STATE) Logger = LogConfig.GetLogger() + State.JobStatus.Start(ctx) Return oJobData.Item(Constants.Scheduler.JOB_CONFIG_ARGUMENTS) End Function + + Public Sub UpdateProgress(pCurrentValue As Integer, pTotalValue As Integer) + State.JobStatus.Update(ctx, pCurrentValue, pTotalValue) + End Sub + + Public Sub CompleteJob() + State.JobStatus.Complete(ctx) + End Sub End Class End Namespace \ No newline at end of file diff --git a/ECM.JobRunner.Windows/Scheduler/Jobs/DebugJob.vb b/ECM.JobRunner.Windows/Scheduler/Jobs/DebugJob.vb index c5984aa..ab51984 100644 --- a/ECM.JobRunner.Windows/Scheduler/Jobs/DebugJob.vb +++ b/ECM.JobRunner.Windows/Scheduler/Jobs/DebugJob.vb @@ -19,6 +19,7 @@ Namespace Scheduler.Jobs context.Result = oResult + CompleteJob() Return Task.FromResult(True) End Function End Class diff --git a/ECM.JobRunner.Windows/Scheduler/Jobs/FileImportJob.vb b/ECM.JobRunner.Windows/Scheduler/Jobs/FileImportJob.vb index 6716b03..da99e5a 100644 --- a/ECM.JobRunner.Windows/Scheduler/Jobs/FileImportJob.vb +++ b/ECM.JobRunner.Windows/Scheduler/Jobs/FileImportJob.vb @@ -13,12 +13,19 @@ Namespace Scheduler.Jobs Logger.Info("Running File Import [{0}]", oName) + Dim oMax = 100 + For index = 1 To oMax + UpdateProgress(index, oMax) + Threading.Thread.Sleep(100) + Next + Dim oResult = New JobResult() With { .Description = $"File Import Job [{oName}] completed!" } context.Result = oResult + CompleteJob() Return Task.FromResult(True) End Function End Class diff --git a/ECM.JobRunner.Windows/Scheduler/Jobs/FileIndexJob.vb b/ECM.JobRunner.Windows/Scheduler/Jobs/FileIndexJob.vb index 921703e..566f530 100644 --- a/ECM.JobRunner.Windows/Scheduler/Jobs/FileIndexJob.vb +++ b/ECM.JobRunner.Windows/Scheduler/Jobs/FileIndexJob.vb @@ -18,6 +18,7 @@ Namespace Scheduler.Jobs context.Result = oResult + CompleteJob() Return Task.FromResult(True) End Function End Class diff --git a/ECM.JobRunner.Windows/Service.vb b/ECM.JobRunner.Windows/Service.vb index 946a6f7..0b49770 100644 --- a/ECM.JobRunner.Windows/Service.vb +++ b/ECM.JobRunner.Windows/Service.vb @@ -52,6 +52,7 @@ Public Class Service WCF.JobRunner.State = State WCF.JobRunner.LogConfig = LogConfig WCF.JobRunner.Database = Database + WCF.JobRunner.Scheduler = Scheduler ' start the service Dim oAddresses() As Uri = {Binding.GetAddress(Config.Host, Config.Port, Config.Name)} diff --git a/ECM.JobRunner.Windows/State.vb b/ECM.JobRunner.Windows/State.vb index d8b7d3a..57b60b5 100644 --- a/ECM.JobRunner.Windows/State.vb +++ b/ECM.JobRunner.Windows/State.vb @@ -12,6 +12,8 @@ Public Class State Private ReadOnly Database As MSSQLServer Public ReadOnly JobHistory As JobHistory + Public ReadOnly JobStatus As JobStatus + Public ReadOnly Property JobTypes As New List(Of JobType) Public ReadOnly Property JobDefinitions As New List(Of JobDefinition) @@ -19,6 +21,7 @@ Public Class State MyBase.New(pLogConfig) Database = pDatabase JobHistory = New JobHistory(pLogConfig) + JobStatus = New JobStatus(pLogConfig) _JobTypes = GetJobTypes() _JobDefinitions = GetJobDefinitions(_JobTypes) @@ -68,6 +71,8 @@ Public Class State Dim oJobs As New List(Of JobDefinition) Try + Logger.Info("Loading Jobs..") + Dim oSQL As String = "SELECT * FROM TBECM_JR_JOB" Dim oTable As DataTable = Database.GetDatatable(oSQL) diff --git a/ECM.JobRunner.Windows/WCF/IJobRunner.vb b/ECM.JobRunner.Windows/WCF/IJobRunner.vb index 46bf3a5..765d6fc 100644 --- a/ECM.JobRunner.Windows/WCF/IJobRunner.vb +++ b/ECM.JobRunner.Windows/WCF/IJobRunner.vb @@ -1,5 +1,8 @@ Imports System.ServiceModel Imports ECM.JobRunner.Common +Imports ECM.JobRunner.Windows.UpdateJob +Imports ECM.JobRunner.Windows.GetJobStatus +Imports ECM.JobRunner.Windows.GetJobConfig Namespace WCF @@ -9,10 +12,13 @@ Namespace WCF Function GetHeartbeat() As Date - Function GetJobHistory() As GetJobHistory.GetJobHistoryResponse + Function GetJobStatus() As GetJobStatusResponse - Function GetJobConfig() As GetJobConfig.GetJobConfigResponse + Function UpdateJob(pData As UpdateJobRequest) As UpdateJobResponse + + + Function GetJobConfig() As GetJobConfigResponse End Interface End Namespace diff --git a/ECM.JobRunner.Windows/WCF/JobRunner.vb b/ECM.JobRunner.Windows/WCF/JobRunner.vb index 68d8960..9038231 100644 --- a/ECM.JobRunner.Windows/WCF/JobRunner.vb +++ b/ECM.JobRunner.Windows/WCF/JobRunner.vb @@ -3,7 +3,7 @@ Imports System.ServiceModel.Description Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Messaging.WCF -Imports ECM.JobRunner.Common +Imports ECM.JobRunner.Windows.Scheduler Namespace WCF @@ -13,6 +13,7 @@ Namespace WCF Public Shared State As State Public Shared LogConfig As LogConfig Public Shared Database As MSSQLServer + Public Shared Scheduler As JobScheduler ''' ''' See: https://stackoverflow.com/questions/42327988/addserviceendpoint-throws-key-is-null @@ -35,8 +36,8 @@ Namespace WCF Return Now End Function - Public Function GetJobHistory() As GetJobHistory.GetJobHistoryResponse Implements IJobRunner.GetJobHistory - Dim oMethod As New GetJobHistory.GetJobHistoryMethod(LogConfig, Database, State) + Public Function GetJobHistory() As GetJobStatus.GetJobStatusResponse Implements IJobRunner.GetJobStatus + Dim oMethod As New GetJobStatus.GetJobStatusMethod(LogConfig, Database, State, Scheduler) Return oMethod.Run() End Function @@ -44,6 +45,11 @@ Namespace WCF Dim oMethod As New GetJobConfig.GetJobConfigMethod(LogConfig, Database, State) Return oMethod.Run() End Function + + Public Function UpdateJob(pData As UpdateJob.UpdateJobRequest) As UpdateJob.UpdateJobResponse Implements IJobRunner.UpdateJob + Dim oMethod As New UpdateJob.UpdateJobMethod(LogConfig, Database, State, Scheduler) + Return oMethod.Run(pData) + End Function End Class End Namespace diff --git a/ECM.JobRunner.Windows/WCF/Methods/GetJobConfig.vb b/ECM.JobRunner.Windows/WCF/Methods/GetJobConfig.vb index e431cf4..be6decd 100644 --- a/ECM.JobRunner.Windows/WCF/Methods/GetJobConfig.vb +++ b/ECM.JobRunner.Windows/WCF/Methods/GetJobConfig.vb @@ -18,8 +18,6 @@ Public Class GetJobConfig .JobDefinitions = State.JobDefinitions } End Function - - End Class Public Class GetJobConfigResponse diff --git a/ECM.JobRunner.Windows/WCF/Methods/GetJobHistory.vb b/ECM.JobRunner.Windows/WCF/Methods/GetJobHistory.vb deleted file mode 100644 index 99194ff..0000000 --- a/ECM.JobRunner.Windows/WCF/Methods/GetJobHistory.vb +++ /dev/null @@ -1,25 +0,0 @@ -Imports DigitalData.Modules.Database -Imports DigitalData.Modules.Logging -Imports ECM.JobRunner.Common -Imports System.Runtime.Serialization - -Public Class GetJobHistory - Public Class GetJobHistoryMethod - Inherits Base.BaseMethod - - Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pState As State) - MyBase.New(pLogConfig, pDatabase, pState) - End Sub - - Public Function Run() As GetJobHistoryResponse - Return New GetJobHistoryResponse With {.Items = State.JobHistory.Entries} - End Function - End Class - - Public Class GetJobHistoryResponse - Inherits Base.BaseResponse - - - Public Property Items As List(Of HistoryItem) - End Class -End Class diff --git a/ECM.JobRunner.Windows/WCF/Methods/GetJobStatus.vb b/ECM.JobRunner.Windows/WCF/Methods/GetJobStatus.vb new file mode 100644 index 0000000..216444b --- /dev/null +++ b/ECM.JobRunner.Windows/WCF/Methods/GetJobStatus.vb @@ -0,0 +1,37 @@ +Imports System.Collections.ObjectModel +Imports System.Runtime.Serialization +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging +Imports ECM.JobRunner.Common +Imports ECM.JobRunner.Windows.Scheduler + +Public Class GetJobStatus + Public Class GetJobStatusMethod + Inherits Base.BaseMethod + + Private ReadOnly Scheduler As JobScheduler + + Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pState As State, pScheduler As JobScheduler) + MyBase.New(pLogConfig, pDatabase, pState) + Scheduler = pScheduler + End Sub + + Public Function Run() As GetJobStatusResponse + Return New GetJobStatusResponse With { + .HistoryItems = State.JobHistory.Entries, + .StatusItems = State.JobStatus.Entries + } + End Function + + End Class + + Public Class GetJobStatusResponse + Inherits Base.BaseResponse + + + Public Property HistoryItems As List(Of HistoryItem) + + + Public Property StatusItems As List(Of StatusItem) + End Class +End Class diff --git a/ECM.JobRunner.Windows/WCF/Methods/UpdateJob.vb b/ECM.JobRunner.Windows/WCF/Methods/UpdateJob.vb new file mode 100644 index 0000000..b2ac7c0 --- /dev/null +++ b/ECM.JobRunner.Windows/WCF/Methods/UpdateJob.vb @@ -0,0 +1,93 @@ +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging +Imports ECM.JobRunner.Common +Imports ECM.JobRunner.Windows.Scheduler + +Public Class UpdateJob + Public Class UpdateJobMethod + Inherits Base.BaseMethod + + Private ReadOnly Scheduler As JobScheduler + + Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pState As State, pScheduler As JobScheduler) + MyBase.New(pLogConfig, pDatabase, pState) + Scheduler = pScheduler + End Sub + + Public Function Run(pData As UpdateJobRequest) As UpdateJobResponse + Dim oResponse As Boolean = False + + Select Case pData.Action + Case UpdateJobRequest.UpdateJobAction.Update + oResponse = DoUpdateJob(pData) + + Case UpdateJobRequest.UpdateJobAction.Create + oResponse = DoCreateJob(pData) + + Case UpdateJobRequest.UpdateJobAction.Delete + oResponse = DoDeleteJob(pData) + + End Select + + If oResponse Then + Scheduler.Reload() + End If + + Return New UpdateJobResponse With {.OK = oResponse} + End Function + + Private Function DoUpdateJob(pData As UpdateJobRequest) As Boolean + Dim oJob = pData.Job + Dim oSQL As String = "UPDATE TBECM_JR_JOB SET TITLE = @TITLE, QUARTZ_DEF = @CRON, JOB_TYPE_ID = @TYPE_ID, ACTIVE = @ACTIVE WHERE GUID = @GUID" + Dim oCommand As New SqlClient.SqlCommand(oSQL) + + oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar, 250).Value = oJob.Name + oCommand.Parameters.Add("CRON", SqlDbType.NVarChar, 250).Value = oJob.CronSchedule + oCommand.Parameters.Add("TYPE_ID", SqlDbType.Int).Value = oJob.TypeId + oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oJob.Active + oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = oJob.Id + + Return Database.ExecuteNonQuery(oCommand) + End Function + + Private Function DoCreateJob(pData As UpdateJobRequest) As Boolean + Dim oJob = pData.Job + Dim oSQL As String = "INSERT INTO TBECM_JR_JOB (TITLE, QUARTZ_DEF, JOB_TYPE_ID, ACTIVE) VALUES (@TITLE, @CRON, @TYPE_ID, @ACTIVE)" + Dim oCommand As New SqlClient.SqlCommand(oSQL) + + oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar, 250).Value = oJob.Name + oCommand.Parameters.Add("CRON", SqlDbType.NVarChar, 250).Value = oJob.CronSchedule + oCommand.Parameters.Add("TYPE_ID", SqlDbType.Int).Value = oJob.TypeId + oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oJob.Active + + Return Database.ExecuteNonQuery(oCommand) + End Function + + Private Function DoDeleteJob(pData As UpdateJobRequest) As Boolean + Dim oJob = pData.Job + Dim oSQL As String = "DELETE FROM TBECM_JR_JOB WHERE GUID = @GUID" + Dim oCommand As New SqlClient.SqlCommand(oSQL) + + oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = oJob.Id + + Return Database.ExecuteNonQuery(oCommand) + End Function + End Class + + + + Public Class UpdateJobRequest + Public Enum UpdateJobAction + Create + Update + Delete + End Enum + + Public Action As UpdateJobAction + Public Job As JobRunnerReference.JobDefinition + End Class + + Public Class UpdateJobResponse + Inherits Base.BaseResponse + End Class +End Class