Merge branch 'develop'

Author: Ethan Hann

IntegrationEngine.Client/EndpointName.cs

@@ -8,6 +8,7 @@ public class EndpointName
         public static string SimpleTrigger = "SimpleTrigger";
         public static string JobType = "JobType";
         public static string TimeZone = "TimeZone";
+        public static string HealthStatus = "HealthStatus";
     }
 }
 

IntegrationEngine.Client/InEngineClient.cs

@@ -1,4 +1,5 @@
-using System;
+using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using IntegrationEngine.Model;
@@ -107,11 +108,11 @@ public SimpleTrigger DeleteSimpleTrigger(string id)
         #endregion
 
         #region TimeZone
-        public IList<TimeZone> GetTimeZones()
+        public IList<InEngineTimeZone> GetTimeZones()
         {
             var request = new RestRequest(EndpointName.TimeZone, Method.GET);
             var result = RestClient.Execute(request);
-            return JsonConvert.DeserializeObject<IList<TimeZone>>(result.Content);
+            return JsonConvert.DeserializeObject<IList<InEngineTimeZone>>(result.Content);
         }
         #endregion
 
@@ -123,6 +124,15 @@ public IList<string> GetJobTypes()
             return JsonConvert.DeserializeObject<IList<string>>(result.Content);
         }
         #endregion
+
+        #region HealthStatus
+        public HealthStatus GetHealthStatus()
+        {
+            var request = new RestRequest(EndpointName.HealthStatus, Method.GET);
+            var result = RestClient.Execute(request);
+            return JsonConvert.DeserializeObject<HealthStatus>(result.Content);
+        }
+        #endregion
     }
 }
 

IntegrationEngine.Core/Mail/IMailClient.cs

@@ -8,6 +8,7 @@ public interface IMailClient
         MailConfiguration MailConfiguration { get; set; }
         SmtpClient SmtpClient { get; set; }
         void Send(MailMessage mailMessage);
+        bool IsServerAvailable();
     }
 }
 

IntegrationEngine.Core/Mail/MailClient.cs

@@ -2,6 +2,8 @@
 using IntegrationEngine.Core.Configuration;
 using System;
 using System.Net.Mail;
+using System.Net.Sockets;
+using System.IO;
 
 namespace IntegrationEngine.Core.Mail
 {
@@ -22,11 +24,11 @@ public MailClient (ILog log) : this()
         public void Send(MailMessage mailMessage)
         {
             ConfigureSmtpClient();
-            try 
+            try
             {
                 SmtpClient.Send(mailMessage);
             } 
-            catch (Exception exception) 
+            catch (Exception exception)
             {
                 Log.Error(exception);
             }
@@ -39,6 +41,36 @@ void ConfigureSmtpClient()
             SmtpClient.Host = MailConfiguration.HostName;
             SmtpClient.Port = MailConfiguration.Port;
         }
+
+        public bool IsServerAvailable()
+        {
+            try 
+            {
+                using (var client = new TcpClient())
+                {
+                    client.Connect(MailConfiguration.HostName, MailConfiguration.Port);
+                    using (var stream = client.GetStream())
+                    {
+                        using (var writer = new StreamWriter(stream))
+                        using (var reader = new StreamReader(stream))
+                        {
+                            writer.WriteLine("EHLO " + MailConfiguration.HostName);
+                            writer.Flush();
+                            var response = reader.ReadLine();
+                            Log.Debug(x => x("Mail server status: {0}", response));
+                            if (response != null)
+                                return true;
+                        }
+                    }
+                }
+            }
+            catch(SocketException exception) 
+            {
+                Log.Error(exception);
+                return false;
+            }
+            return false;
+        }
     }
 }
 

IntegrationEngine.Core/Storage/ESRepository.cs

@@ -1,4 +1,5 @@
-using IntegrationEngine.Model;
+using Common.Logging;
+using IntegrationEngine.Model;
 using Nest;
 using System;
 using System.Collections.Generic;
@@ -8,7 +9,8 @@ namespace IntegrationEngine.Core.Storage
 {
     public class ESRepository<T> : IRepository<T> where T : class, IHasStringId
     {
-        public ElasticClient ElasticClient{ get; set; }
+        public IElasticClient ElasticClient { get; set; }
+        public ILog Log { get; set; }
 
         public ESRepository()
         {
@@ -73,6 +75,19 @@ public void Dispose()
         {
             throw new NotImplementedException();
         }
+
+        public bool IsServerAvailable()
+        {
+            try 
+            {
+                return ElasticClient.Ping(new PingRequest()).ConnectionStatus.Success;
+            }
+            catch(Exception exception) 
+            {
+                Log.Error(exception);
+                return false;
+            }
+        }
     }
 }
 

IntegrationEngine.Core/Storage/IRepository.cs

@@ -18,5 +18,6 @@ public interface IRepository<T> where T : class
         bool Exists(object id);
         void SetState(T value, EntityState entityState);
         void Dispose();
+        bool IsServerAvailable();
     }
 }

IntegrationEngine.Core/Storage/Repository.cs

@@ -69,5 +69,10 @@ public void Dispose()
         {
             db.Dispose();
         }
+
+        public bool IsServerAvailable()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

IntegrationEngine.Model.net40/IHasStateId.cs

@@ -52,7 +52,6 @@
     <Compile Include="..\IntegrationEngine.Model\ISimpleTrigger.cs">
       <Link>ISimpleTrigger.cs</Link>
     </Compile>
-    <Compile Include="IHasStateId.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\IntegrationEngine.Model\SimpleTrigger.cs">
       <Link>SimpleTrigger.cs</Link>
@@ -63,6 +62,18 @@
     <Compile Include="..\IntegrationEngine.Model\IIntegrationJobTrigger.cs">
       <Link>IIntegrationJobTrigger.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\ITimeZone.cs">
+      <Link>ITimeZone.cs</Link>
+    </Compile>
+    <Compile Include="..\IntegrationEngine.Model\TimeZone.cs">
+      <Link>TimeZone.cs</Link>
+    </Compile>
+    <Compile Include="..\IntegrationEngine.Model\HealthStatus.cs">
+      <Link>HealthStatus.cs</Link>
+    </Compile>
+    <Compile Include="..\IntegrationEngine.Model\IHealthStatus.cs">
+      <Link>IHealthStatus.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj

@@ -9,5 +9,9 @@ public class CronTrigger : ICronTrigger
         public string CronExpressionString { get; set; }
         public string TimeZoneId { get; set; }
         public int StateId { get; set; }
+
+        public string CronExpressionDescription { get { throw new NotImplementedException(); } }
+        public TimeZoneInfo TimeZoneInfo { get { throw new NotImplementedException(); } }
+        public string StateDescription { get { throw new NotImplementedException(); } }
     }
 }