Add LogEvent to Web API

ethanhann · ethanhann · commit 902a33c7a591 · 2015-02-02T23:08:40.000-05:00
diff --git a/IntegrationEngine.ConsoleClient/Options.cs b/IntegrationEngine.ConsoleClient/Options.cs
@@ -23,7 +23,7 @@ public class Options
         public string GetUsage()
         {
             var version = (Attribute.GetCustomAttribute(
-                Assembly.GetEntryAssembly(), 
+                Assembly.GetEntryAssembly(),
                 typeof(AssemblyInformationalVersionAttribute)) 
                 as AssemblyInformationalVersionAttribute).InformationalVersion;
             var usage = new StringBuilder();
diff --git a/IntegrationEngine.ConsoleHost/App.config b/IntegrationEngine.ConsoleHost/App.config
@@ -14,7 +14,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj b/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj
@@ -69,6 +69,15 @@
     <Reference Include="RazorEngine">
       <HintPath>..\packages\RazorEngine.3.5.3\lib\net45\RazorEngine.dll</HintPath>
     </Reference>
+    <Reference Include="Elasticsearch.Net">
+      <HintPath>..\packages\Elasticsearch.Net.1.4.0\lib\net45\Elasticsearch.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog.Targets.ElasticSearch">
+      <HintPath>..\packages\NLog.Targets.ElasticSearch.0.9.5.0\lib\net40\NLog.Targets.ElasticSearch.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="InEngineServerInstaller.cs">
diff --git a/IntegrationEngine.ConsoleHost/packages.config b/IntegrationEngine.ConsoleHost/packages.config
@@ -1,6 +1,9 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Elasticsearch.Net" version="1.4.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.0" targetFramework="net45" />
+  <package id="NLog" version="3.1.0.0" targetFramework="net45" />
+  <package id="NLog.Targets.ElasticSearch" version="0.9.5.0" targetFramework="net45" />
   <package id="RazorEngine" version="3.5.3" targetFramework="net45" />
 </packages>
diff --git a/IntegrationEngine.Core/Storage/DatabaseRepository.cs b/IntegrationEngine.Core/Storage/DatabaseRepository.cs
@@ -1,10 +1,12 @@
-﻿using Common.Logging;using System;
+﻿using Common.Logging;
+using IntegrationEngine.Model;
+using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
-using IntegrationEngine.Model;
 
 namespace IntegrationEngine.Core.Storage
 {
diff --git a/IntegrationEngine.Core/Storage/ElasticsearchRepository.cs b/IntegrationEngine.Core/Storage/ElasticsearchRepository.cs
@@ -2,8 +2,10 @@
 using IntegrationEngine.Model;
 using Nest;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 
 namespace IntegrationEngine.Core.Storage
 {
@@ -24,8 +26,49 @@ public IEnumerable<TItem> SelectAll<TItem>() where TItem : class, IHasStringId
                     h.Source.Id = h.Id;
                     return h.Source;
             });
-            var list = documents.ToList();
-            return list;
+            return documents.ToList();
+        }
+
+        public IEnumerable<TItem> SelectAll<TItem, TKey>(Expression<Func<TItem, TKey>> orderBy, 
+            bool ascending = true, 
+            int pageIndex = 0, 
+            int rowCount = 10) 
+            where TItem : class, IHasStringId
+        {
+            var documents = ElasticClient.Search<TItem>(x => x.From(pageIndex).Size(rowCount))
+                .Hits
+                .Select(h => {
+                    h.Source.Id = h.Id;
+                    return h.Source;
+                }).AsQueryable();
+            if (ascending)
+                documents.OrderBy(orderBy);
+            else 
+                documents.OrderByDescending(orderBy);
+            return documents.ToList();
+        }
+
+        public IEnumerable<TItem> Search<TItem, TKey>(string query, 
+            Expression<Func<TItem, TKey>> orderBy,
+            bool ascending = true,
+            int pageIndex = 0,
+            int rowCount = 10) 
+            where TItem : class, IHasStringId
+        {
+            var documents = ElasticClient.Search<TItem>(x => x
+                .From(pageIndex)
+                .Size(rowCount)
+                .Query(q => q.Match(m => m.OnField("_all").Query(query)) || q.Fuzzy(fd => fd.OnField("_all").PrefixLength(1).Value(query).Boost(0.1))))
+                .Hits
+                .Select(h => {
+                    h.Source.Id = h.Id;
+                    return h.Source;
+                }).AsQueryable();
+            if (ascending)
+                documents.OrderBy(orderBy);
+            else 
+                documents.OrderByDescending(orderBy);
+            return documents.AsEnumerable();
         }
 
         public TItem SelectById<TItem>(object id) where TItem : class, IHasStringId
diff --git a/IntegrationEngine.Core/Storage/IElasticsearchRepository.cs b/IntegrationEngine.Core/Storage/IElasticsearchRepository.cs
@@ -1,10 +1,15 @@
 ﻿using IntegrationEngine.Model;
 using System;
+using System.Linq;
+using System.Linq.Expressions;
 using System.Collections.Generic;
 
 namespace IntegrationEngine.Core.Storage
 {
     public interface IElasticsearchRepository : IRepository<IHasStringId>
-    {}
+    {
+        IEnumerable<TItem> SelectAll<TItem, TKey>(Expression<Func<TItem, TKey>> orderBy, bool ascending = true, int pageIndex = 0, int rowCount = 10) where TItem : class, IHasStringId;
+        IEnumerable<TItem> Search<TItem, TKey>(string query, Expression<Func<TItem, TKey>> orderBy, bool ascending = true, int pageIndex = 0, int rowCount = 10) where TItem : class, IHasStringId;
+    }
 }
 
diff --git a/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj b/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj
@@ -106,6 +106,9 @@
     <Compile Include="..\IntegrationEngine.Model\IHasLongId.cs">
       <Link>IHasLongId.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\LogEvent.cs">
+      <Link>LogEvent.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/IntegrationEngine.Model/IntegrationEngine.Model.csproj b/IntegrationEngine.Model/IntegrationEngine.Model.csproj
@@ -74,6 +74,7 @@
     <Compile Include="TriggerPropertyExtension.cs" />
     <Compile Include="TriggerStateDescription.cs" />
     <Compile Include="IHasLongId.cs" />
+    <Compile Include="LogEvent.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="package.nuspec">
diff --git a/IntegrationEngine.Model/LogEvent.cs b/IntegrationEngine.Model/LogEvent.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using Nest;
+
+namespace IntegrationEngine.Model
+{
+    public class LogEvent : IHasStringId
+    {
+        public string Id { get; set; }
+        [ElasticProperty(Name = "@timestamp")]
+        public DateTimeOffset Timestamp { get; set; }
+        public string Level { get; set; }
+        public string Message { get; set; }
+    }
+}
diff --git a/IntegrationEngine.Tests/app.config b/IntegrationEngine.Tests/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.2.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/IntegrationEngine.userprefs b/IntegrationEngine.userprefs
@@ -1,4 +1,4 @@
-﻿<Properties StartupItem="IntegrationEngine.ConsoleClient/IntegrationEngine.ConsoleClient.csproj">
+﻿<Properties StartupItem="IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="IntegrationEngine.ConsoleClient/Options.cs">
     <Files>
diff --git a/IntegrationEngine/Api/Controllers/LogEventController.cs b/IntegrationEngine/Api/Controllers/LogEventController.cs
@@ -0,0 +1,34 @@
+﻿using IntegrationEngine.Core.Storage;
+using IntegrationEngine.Model;
+using IntegrationEngine.Scheduler;
+using Nest;
+using Quartz;
+using Quartz.Impl.Matchers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Web.Http;
+using System.Web.Http.Description;
+
+namespace IntegrationEngine.Api.Controllers
+{
+    public class LogEventController : ApiController
+    {
+        public IElasticsearchRepository Repository { get; set; }
+
+        public LogEventController()
+        {}
+
+        public LogEventController(IElasticsearchRepository repository)
+            : this()
+        {
+            Repository = repository;
+        }
+
+        public IEnumerable<LogEvent> GetAll()
+        {
+            return Repository.SelectAll<LogEvent, DateTimeOffset>(x => x.Timestamp);
+        }
+    }
+}
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
@@ -137,6 +137,9 @@
     <Reference Include="CronExpressionDescriptor">
       <HintPath>..\packages\CronExpressionDescriptor.1.13.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
     </Reference>
+    <Reference Include="NLog.Targets.ElasticSearch">
+      <HintPath>..\packages\NLog.Targets.ElasticSearch.0.9.5.0\lib\net40\NLog.Targets.ElasticSearch.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
@@ -178,6 +181,7 @@
     <Compile Include="DataAnnotations\JobTypeAttribute.cs" />
     <Compile Include="Api\Controllers\HealthStatusController.cs" />
     <Compile Include="Api\TriggerControllerBase.cs" />
+    <Compile Include="Api\Controllers\LogEventController.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/IntegrationEngine/MessageQueue/MsmqListener.cs b/IntegrationEngine/MessageQueue/MsmqListener.cs
@@ -1,4 +1,4 @@
-﻿﻿using Common.Logging;
+﻿using Common.Logging;
 using IntegrationEngine.Core.Jobs;
 using IntegrationEngine.Core.Mail;
 using IntegrationEngine.Core.Storage;
@@ -58,6 +58,7 @@ public void Dispose()
         {
             throw new NotImplementedException();
         }
+
         T AutoWireJob<T>(T job, Type type)
         {
             if (type.GetInterface(typeof(IMailJob).Name) != null)
diff --git a/IntegrationEngine/packages.config b/IntegrationEngine/packages.config
@@ -19,6 +19,7 @@
   <package id="NEST" version="1.4.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NLog" version="3.1.0.0" targetFramework="net45" />
+  <package id="NLog.Targets.ElasticSearch" version="0.9.5.0" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="Quartz" version="2.3.1" targetFramework="net45" />
   <package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />
diff --git a/configuration/IntegrationEngine.nlog.xml b/configuration/IntegrationEngine.nlog.xml
@@ -2,15 +2,23 @@
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
+  <extensions>
+    <add assembly="NLog.Targets.ElasticSearch"/>
+  </extensions>
+
   <targets>
     <target name="logfile" xsi:type="File" fileName="IntegrationEngine.log.txt" />
     <target name="console" xsi:type="Console" />
     <target name="mailServer" xsi:type="Mail" to="ethanhann@gmail.com" from="ethanhann@gmail.com" />
+    <target name="elastic" xsi:type="BufferingWrapper" flushTimeout="5000">
+      <target xsi:type="ElasticSearch" index="integration-engine"/>
+    </target>
   </targets>
 
   <rules>
     <logger name="*" minlevel="Trace" writeTo="logfile" />
     <logger name="*" writeTo="console" />
     <logger name="*" minlevel="Error" writeTo="mailServer" />
+    <logger name="*" writeTo="elastic" />    
   </rules>
 </nlog>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class Options`
`23`	`23`	`public string GetUsage()`
`24`	`24`	`{`
`25`	`25`	`var version = (Attribute.GetCustomAttribute(`
`26`		`- Assembly.GetEntryAssembly(),`
	`26`	`+ Assembly.GetEntryAssembly(),`
`27`	`27`	`typeof(AssemblyInformationalVersionAttribute))`
`28`	`28`	`as AssemblyInformationalVersionAttribute).InformationalVersion;`
`29`	`29`	`var usage = new StringBuilder();`