Skip to content

Commit 8a0f3bc

Browse files
ethanhannethanhann
committed
Merge branch 'develop'
2 parents c13ec52 + f599919 commit 8a0f3bc

33 files changed

+298
-126
lines changed

‎IntegrationEngine.ConsoleHost/App.config‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
5-
</configSections>
6-
<log4net>
7-
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
8-
<layout type="log4net.Layout.PatternLayout">
9-
<conversionPattern value="%date %-5level %logger - %message%newline" />
10-
</layout>
11-
</appender>
12-
<root>
13-
<level value="INFO" />
14-
<appender-ref ref="ConsoleAppender" />
15-
</root>
16-
</log4net>
4+
</configSections>
175
<runtime>
186
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
197
<dependentAssembly>
208
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
219
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
2210
</dependentAssembly>
11+
<dependentAssembly>
12+
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
13+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
14+
</dependentAssembly>
15+
<dependentAssembly>
16+
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
17+
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
18+
</dependentAssembly>
2319
</assemblyBinding>
2420
</runtime>
2521
</configuration>

‎IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,15 @@
5959
<Reference Include="Microsoft.Owin.Host.HttpListener">
6060
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.3.0.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
6161
</Reference>
62-
<Reference Include="RazorEngine">
63-
<HintPath>..\packages\RazorEngine.3.4.2\lib\net45\RazorEngine.dll</HintPath>
62+
<Reference Include="RazorEngine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
63+
<SpecificVersion>False</SpecificVersion>
64+
<HintPath>..\packages\RazorEngine.3.5.0\lib\net45\RazorEngine.dll</HintPath>
6465
</Reference>
6566
<Reference Include="System" />
6667
<Reference Include="System.ComponentModel.DataAnnotations" />
67-
<Reference Include="System.Web.Razor">
68-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
68+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<SpecificVersion>False</SpecificVersion>
70+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
6971
</Reference>
7072
</ItemGroup>
7173
<ItemGroup>
@@ -103,6 +105,11 @@
103105
<SubType>Designer</SubType>
104106
</None>
105107
</ItemGroup>
106-
<ItemGroup />
108+
<ItemGroup>
109+
<Content Include="..\configuration\IntegrationEngine.nlog.xml">
110+
<Link>IntegrationEngine.nlog.xml</Link>
111+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112+
</Content>
113+
</ItemGroup>
107114
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
108115
</Project>

‎IntegrationEngine.ConsoleHost/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
44
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.0" targetFramework="net45" />
5-
<package id="RazorEngine" version="3.4.2" targetFramework="net45" />
5+
<package id="RazorEngine" version="3.5.0" targetFramework="net45" />
66
</packages>

‎IntegrationEngine.Core/IntegrationEngine.Core.csproj‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,31 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35+
<Reference Include="Common.Logging">
36+
<HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
37+
</Reference>
38+
<Reference Include="Common.Logging.Core">
39+
<HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
40+
</Reference>
41+
<Reference Include="Common.Logging.NLog31">
42+
<HintPath>..\packages\Common.Logging.NLog31.3.0.0\lib\net40\Common.Logging.NLog31.dll</HintPath>
43+
</Reference>
3544
<Reference Include="Elasticsearch.Net">
3645
<HintPath>..\packages\Elasticsearch.Net.1.3.1\lib\Elasticsearch.Net.dll</HintPath>
3746
</Reference>
38-
<Reference Include="log4net">
39-
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
40-
</Reference>
4147
<Reference Include="Nest">
4248
<HintPath>..\packages\NEST.1.3.1\lib\Nest.dll</HintPath>
4349
</Reference>
44-
<Reference Include="Newtonsoft.Json">
45-
<HintPath>..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
53+
</Reference>
54+
<Reference Include="NLog">
55+
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
4656
</Reference>
47-
<Reference Include="RabbitMQ.Client">
48-
<HintPath>..\packages\RabbitMQ.Client.3.4.0\lib\net35\RabbitMQ.Client.dll</HintPath>
57+
<Reference Include="RabbitMQ.Client, Version=3.4.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
58+
<SpecificVersion>False</SpecificVersion>
59+
<HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
4960
</Reference>
5061
<Reference Include="System" />
5162
<Reference Include="System.ComponentModel.DataAnnotations" />

‎IntegrationEngine.Core/Jobs/ILogJob.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using log4net;
1+
using Common.Logging;
22

33
namespace IntegrationEngine.Core.Jobs
44
{

‎IntegrationEngine.Core/Jobs/SqlJob.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using IntegrationEngine.Core.Mail;
1+
using Common.Logging;
2+
using IntegrationEngine.Core.Mail;
23
using IntegrationEngine.Core.Reports;
34
using IntegrationEngine.Core.Storage;
4-
using log4net;
55
using System;
66
using System.Collections.Generic;
77
using System.Linq;
@@ -29,7 +29,7 @@ public virtual IList<T> RunQuery<T>()
2929
}
3030
catch(ArgumentException exception)
3131
{
32-
Log.Error(exception.Message, exception);
32+
Log.Error(exception);
3333
}
3434
return new List<T>();
3535
}

‎IntegrationEngine.Core/Mail/MailClient.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using IntegrationEngine.Core.Configuration;
2-
using log4net;
1+
using Common.Logging;
2+
using IntegrationEngine.Core.Configuration;
33
using System;
44
using System.Net.Mail;
55

@@ -22,11 +22,13 @@ public MailClient (ILog log) : this()
2222
public void Send(MailMessage mailMessage)
2323
{
2424
ConfigureSmtpClient();
25-
try {
26-
25+
try
26+
{
2727
SmtpClient.Send(mailMessage);
28-
} catch (Exception exception) {
29-
Log.Error("Cannot send mail message", exception);
28+
}
29+
catch (Exception exception)
30+
{
31+
Log.Error(exception);
3032
}
3133
}
3234

‎IntegrationEngine.Core/package.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<dependency id="MySql.Data" version="6.9.5" />
2525
<dependency id="MySql.Data.Entity" version="6.9.5" />
2626
<dependency id="NEST" version="1.3.1" />
27-
<dependency id="Newtonsoft.Json" version="6.0.7" />
28-
<dependency id="RabbitMQ.Client" version="3.4.0" />
27+
<dependency id="Newtonsoft.Json" version="6.0.8" />
28+
<dependency id="RabbitMQ.Client" version="3.4.3" />
2929
</dependencies>
3030
</metadata>
3131
</package>

‎IntegrationEngine.Core/packages.config‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Common.Logging" version="3.0.0" targetFramework="net45" />
4+
<package id="Common.Logging.Core" version="3.0.0" targetFramework="net45" />
5+
<package id="Common.Logging.NLog31" version="3.0.0" targetFramework="net45" />
36
<package id="Elasticsearch.Net" version="1.3.1" targetFramework="net45" />
47
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
5-
<package id="log4net" version="2.0.3" targetFramework="net45" />
68
<package id="MySql.Data" version="6.9.5" targetFramework="net45" />
79
<package id="MySql.Data.Entity" version="6.9.5" targetFramework="net45" />
810
<package id="NEST" version="1.3.1" targetFramework="net45" />
9-
<package id="Newtonsoft.Json" version="6.0.7" targetFramework="net45" />
10-
<package id="RabbitMQ.Client" version="3.4.0" targetFramework="net45" />
11+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
12+
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
13+
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />
1114
</packages>

‎IntegrationEngine.Tests/Api/Controllers/CronTriggerControllerTest.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ namespace IntegrationEngine.Tests.Api.Controllers
1010
public class CronTriggerControllerTest
1111
{
1212
[Test]
13-
public void ShouldScheduleJobWhenCronTriggerIsCreated()
13+
public void ShouldScheduleJobWhenCronTriggerIsCreatedWithValidCronExpression()
1414
{
1515
var subject = new CronTriggerController();
16-
var cronExpression = "0 6 * * 1-5";
16+
var cronExpression = "0 6 * * 1-5 ?";
1717
var jobType = "MyProject.MyIntegrationJob";
1818
var expected = new CronTrigger() {
1919
JobType = jobType,
2020
CronExpressionString = cronExpression
2121
};
2222
var engineScheduler = new Mock<IEngineScheduler>();
2323
engineScheduler.Setup(x => x.ScheduleJobWithCronTrigger(expected));
24+
engineScheduler.Setup(x => x.IsJobTypeRegistered(expected.JobType)).Returns(true);
2425
subject.EngineScheduler = engineScheduler.Object;
2526
var esRepository = new Mock<ESRepository<CronTrigger>>();
2627
esRepository.Setup(x => x.Insert(expected)).Returns(expected);

0 commit comments

Comments
 (0)