fergalmoran/Quartzmin
1
0
Fork 0
mirror of https://github.com/fergalmoran/Quartzmin.git synced 2025-12-22 09:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up

Browse Source
This commit is contained in:
Ján Lučanský
2018-12-29 23:49:13 +01:00
parent 6b2f18bfb4
commit ace5bc0dc6
17 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Examples/AspNetCoreDocker/Program.cs
View File

@@ -9,7 +9,7 @@ namespace AspNetCoreDocker
{
public static void Main(string[] args)
{
var scheduler = DemoScheduler.Create();
var scheduler = DemoScheduler.Create().Result;
var host = WebHost.CreateDefaultBuilder(args).Configure(app =>
{

4
Source/Examples/AspNetCoreDocker/app.config
View File

@@ -4,7 +4,7 @@
<section name="quartz" type="System.Configuration.NameValueFileSectionHandler" />
</configSections>
<quartz>
<add key="quartz.plugin.executionHistoryPlugin.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.executionHistoryPlugin.executionHistoryStoreType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
</quartz>
</configuration>

2
Source/Examples/AspNetCoreHost/Startup.cs
View File

@@ -14,7 +14,7 @@ namespace Quartzmin.AspNetCore
{
app.UseQuartzmin(new QuartzminOptions()
{
Scheduler = DemoScheduler.Create(),
Scheduler = DemoScheduler.Create().Result,
});
}
}

4
Source/Examples/AspNetCoreHost/app.config
View File

@@ -5,7 +5,7 @@
</configSections>
<quartz>
<add key="quartz.plugin.executionHistoryPlugin.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.executionHistoryPlugin.executionHistoryStoreType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
</quartz>
</configuration>

2
Source/Examples/AspNetWebHost/Startup.cs
View File

@@ -12,7 +12,7 @@ namespace Quartzmin.AspNet
{
app.UseQuartzmin(new QuartzminOptions()
{
Scheduler = DemoScheduler.Create(),
Scheduler = DemoScheduler.Create().Result,
DefaultDateFormat = "dd.MM.yyyy",
VirtualPathRoot = "/test",

4
Source/Examples/AspNetWebHost/Web.config
View File

@@ -10,8 +10,8 @@
</configSections>
<quartz>
<add key="quartz.plugin.executionHistoryPlugin.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.executionHistoryPlugin.executionHistoryStoreType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
</quartz>
<system.web>

2
Source/Examples/NetCoreSelfHost/Program.cs
View File

@@ -7,7 +7,7 @@ namespace NetCoreSelfHost
{
static void Main(string[] args)
{
var scheduler = DemoScheduler.Create();
var scheduler = DemoScheduler.Create().Result;
scheduler.Start();
while (!scheduler.IsShutdown)

4
Source/Examples/NetCoreSelfHost/app.config
View File

@@ -5,8 +5,8 @@
</configSections>
<quartz>
<add key="quartz.plugin.executionHistoryPlugin.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.executionHistoryPlugin.executionHistoryStoreType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.quartzmin.type" value="Quartzmin.SelfHost.QuartzminPlugin, Quartzmin.SelfHost" />
<add key="quartz.plugin.quartzmin.url" value="http://*:333" />

39
Source/Examples/Shared/DemoScheduler.cs
View File

@@ -10,10 +10,9 @@ namespace Quartzmin
{
public static class DemoScheduler
{
public static IScheduler Create(bool start = true)
public static async Task<IScheduler> Create(bool start = true)
{
var schedulerFactory = new StdSchedulerFactory();
var scheduler = schedulerFactory.GetScheduler().Result;
var scheduler = await StdSchedulerFactory.GetDefaultScheduler();
{
var jobData = new JobDataMap();
@@ -31,7 +30,7 @@ namespace Quartzmin
.StartNow()
.WithCronSchedule("0 0 8 1/1 * ? *")
.Build();
scheduler.ScheduleJob(job, trigger).Wait();
await scheduler.ScheduleJob(job, trigger);
trigger = TriggerBuilder.Create()
.WithIdentity("MonthlySales")
@@ -39,8 +38,8 @@ namespace Quartzmin
.StartNow()
.WithCronSchedule("0 0 12 1 1/1 ? *")
.Build();
scheduler.ScheduleJob(trigger).Wait();
scheduler.PauseTrigger(trigger.Key).Wait();
await scheduler.ScheduleJob(trigger);
await scheduler.PauseTrigger(trigger.Key);
trigger = TriggerBuilder.Create()
.WithIdentity("HourlySales")
@@ -48,22 +47,22 @@ namespace Quartzmin
.StartNow()
.WithSimpleSchedule(x => x.WithIntervalInHours(1).RepeatForever())
.Build();
scheduler.ScheduleJob(trigger).Wait();
await scheduler.ScheduleJob(trigger);
}
{
var job = JobBuilder.Create<DummyJob>().WithIdentity("Job1").StoreDurably().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
job = JobBuilder.Create<DummyJob>().WithIdentity("Job2").StoreDurably().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
job = JobBuilder.Create<DummyJob>().WithIdentity("Job3").StoreDurably().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
job = JobBuilder.Create<DummyJob>().WithIdentity("Job4").StoreDurably().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
job = JobBuilder.Create<DummyJob>().WithIdentity("Job5").StoreDurably().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
job = JobBuilder.Create<DummyJob>().WithIdentity("Send SMS", "CRITICAL").StoreDurably().RequestRecovery().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
var trigger = TriggerBuilder.Create()
.WithIdentity("PushAds (US)")
@@ -72,7 +71,7 @@ namespace Quartzmin
.StartNow()
.WithCronSchedule("0 0/5 * 1/1 * ? *")
.Build();
scheduler.ScheduleJob(trigger).Wait();
await scheduler.ScheduleJob(trigger);
trigger = TriggerBuilder.Create()
.WithIdentity("PushAds (EU)")
@@ -81,11 +80,11 @@ namespace Quartzmin
.StartNow()
.WithCronSchedule("0 0/7 * 1/1 * ? *")
.Build();
scheduler.ScheduleJob(trigger).Wait();
scheduler.PauseTriggers(GroupMatcher<TriggerKey>.GroupEquals("LONGRUNNING"));
await scheduler.ScheduleJob(trigger);
await scheduler.PauseTriggers(GroupMatcher<TriggerKey>.GroupEquals("LONGRUNNING"));
job = JobBuilder.Create<DummyJob>().WithIdentity("Send Push", "CRITICAL").StoreDurably().RequestRecovery().Build();
scheduler.AddJob(job, false).Wait();
await scheduler.AddJob(job, false);
}
{
@@ -99,17 +98,17 @@ namespace Quartzmin
.StartNow()
.WithSimpleSchedule(x => x.WithIntervalInSeconds(5).RepeatForever())
.Build();
scheduler.ScheduleJob(job, trigger).Wait();
await scheduler.ScheduleJob(job, trigger);
trigger = TriggerBuilder.Create()
.WithIdentity("CSV_big", "LONGRUNNING")
.ForJob(job)
.StartNow()
.WithDailyTimeIntervalSchedule(x=>x.OnMondayThroughFriday())
.Build();
scheduler.ScheduleJob(trigger).Wait();
await scheduler.ScheduleJob(trigger);
}
if (start)
scheduler.Start().GetAwaiter().GetResult();
await scheduler.Start();
return scheduler;
}

4
Source/Examples/WinFormSelfHost/App.config
View File

@@ -9,8 +9,8 @@
</startup>
<quartz>
<add key="quartz.plugin.executionHistoryPlugin.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.executionHistoryPlugin.executionHistoryStoreType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
<add key="quartz.plugin.quartzmin.type" value="Quartzmin.SelfHost.QuartzminPlugin, Quartzmin.SelfHost" />
<add key="quartz.plugin.quartzmin.url" value="http://localhost:9999" />

2
Source/Examples/WinFormSelfHost/MainForm.cs
View File

@@ -18,7 +18,7 @@ namespace WinFormSelfHost
void CreateScheduler()
{
scheduler = DemoScheduler.Create(start: false);
scheduler = DemoScheduler.Create(start: false).Result;
}
private void btnStart_Click(object sender, EventArgs e)

4
Source/Examples/WinFormSelfHost/WinFormSelfHost.csproj
View File

@@ -36,8 +36,8 @@
<Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Owin.Host.HttpListener.2.0.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>

2
Source/Examples/WinFormSelfHost/packages.config
View File

@@ -5,7 +5,7 @@
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.6" targetFramework="net452" />
<package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.6" targetFramework="net452" />
<package id="Microsoft.Owin" version="2.1.0" targetFramework="net452" />
<package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
<package id="Microsoft.Owin.Host.HttpListener" version="2.1.0" targetFramework="net452" />
<package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net452" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
<package id="Owin" version="1.0" targetFramework="net452" />

11
Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs
View File

@@ -1,5 +1,4 @@
using Quartz;
using Quartz.Impl.Matchers;
using Quartz.Impl.Matchers;
using Quartz.Spi;
using System;
using System.Threading;
@@ -13,7 +12,7 @@ namespace Quartz.Plugins.RecentHistory
IExecutionHistoryStore _store;
public string Name { get; set; }
public Type ExecutionHistoryStoreType { get; set; }
public Type StoreType { get; set; }
public Task Initialize(string pluginName, IScheduler scheduler, CancellationToken cancellationToken = default(CancellationToken))
{
@@ -30,11 +29,11 @@ namespace Quartz.Plugins.RecentHistory
if (_store == null)
{
if (ExecutionHistoryStoreType != null)
_store = (IExecutionHistoryStore)Activator.CreateInstance(ExecutionHistoryStoreType);
if (StoreType != null)
_store = (IExecutionHistoryStore)Activator.CreateInstance(StoreType);
if (_store == null)
throw new Exception(nameof(ExecutionHistoryStoreType) + " is not set.");
throw new Exception(nameof(StoreType) + " is not set.");
_scheduler.Context.SetExecutionHistoryStore(_store);
}

8
Source/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj
View File

@@ -7,17 +7,19 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1591</NoWarn>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
<Product>Quartz.Plugins.RecentHistory</Product>
<Title>Quartz.NET plugin to persist recent job execution history</Title>
<Authors>Jan Lucansky</Authors>
<PackageProjectUrl>https://github.com/jlucansky/Quartzmin</PackageProjectUrl>
<Description>This is supporting package for Quartzmin</Description>
<PackageTags>quartz recent history</PackageTags>
<PackageTags>quartz;recent;history</PackageTags>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2018 Jan Lucansky</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jlucansky/Quartzmin</RepositoryUrl>
</PropertyGroup>
<ItemGroup>

9
Source/Quartzmin.SelfHost/Quartzmin.SelfHost.csproj
View File

@@ -7,18 +7,20 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>1591</NoWarn>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
<Product>Quartzmin.SelfHost</Product>
<Title>Quartzmin Self Host</Title>
<Authors>Jan Lucansky</Authors>
<PackageProjectUrl>https://github.com/jlucansky/Quartzmin</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/jlucansky/public-assets/master/Quartzmin/avatar.png</PackageIconUrl>
<Description>This package allows you to host Quartzmin within your own process.</Description>
<PackageTags>quartzmin web host</PackageTags>
<PackageTags>quartzmin;web;host</PackageTags>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2018 Jan Lucansky</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jlucansky/Quartzmin</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
@@ -34,6 +36,7 @@
</ItemGroup>
<ItemGroup Condition="$(DefineConstants.Contains('NETFRAMEWORK'))">
<PackageReference Include="Microsoft.Owin.Hosting" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
</ItemGroup>

7
Source/Quartzmin/Quartzmin.csproj
View File

@@ -8,17 +8,20 @@
<NoWarn>1591</NoWarn>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
<Product>Quartzmin</Product>
<Title>Web management tool for Quartz.NET</Title>
<Authors>Jan Lucansky</Authors>
<PackageProjectUrl>https://github.com/jlucansky/Quartzmin</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/jlucansky/public-assets/master/Quartzmin/avatar.png</PackageIconUrl>
<Description>Powerful, easy to use web management tool for Quartz.NET</Description>
<PackageTags>quartz web ui</PackageTags>
<PackageTags>quartz;web;ui</PackageTags>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Copyright © 2018 Jan Lucansky</Copyright>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jlucansky/Quartzmin</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">