Merge branch 'hotfix-1.4.1'

Author: Greg Bielleman

src/Chocolatey/ServiceControl.install.nuspec

@@ -7,6 +7,7 @@
     <authors>Particular Software</authors>
     <owners>Particular Software</owners>
     <projectUrl>http://particular.net</projectUrl>
+    <licenseUrl>http://particular.net/LicenseAgreement</licenseUrl>
     <iconUrl>http://s3.amazonaws.com/nuget.images/ServiceControl_128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Management extension to NServiceBus</description>

src/ServiceControl.UnitTests/Infrastructure/TransportMessageExtensionsTests.cs

@@ -0,0 +1,60 @@
+namespace ServiceControl.UnitTests.Infrastructure
+{
+    using System;
+    using System.Collections.Generic;
+    using NServiceBus;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class TransportMessageExtensionsTests
+    {
+        [Test]
+        public void No_headers_should_throw_with_message_id()
+        {
+            var message = new TransportMessage(Guid.Empty.ToString(),new Dictionary<string, string>());
+            var exception = Assert.Throws<Exception>(() => { message.ProcessingEndpointName(); });
+            Assert.AreEqual("No processing endpoint could be determined for message (00000000-0000-0000-0000-000000000000)",exception.Message);
+        }
+
+        [Test]
+        public void No_headers_with_message_type_should_throw_with_message_id_and_types()
+        {
+            var message = new TransportMessage(Guid.Empty.ToString(), new Dictionary<string, string>
+                                                                      {
+                                                                          { Headers.EnclosedMessageTypes ,"TheMessageType"}
+                                                                      });
+            var exception = Assert.Throws<Exception>(() => { message.ProcessingEndpointName(); });
+            Assert.AreEqual("No processing endpoint could be determined for message (00000000-0000-0000-0000-000000000000) with EnclosedMessageTypes (TheMessageType)", exception.Message);
+        }
+
+        [Test]
+        public void With_ProcessingEndpoint_header_should_return_processing_endpoint()
+        {
+            var message = new TransportMessage(Guid.Empty.ToString(), new Dictionary<string, string>
+                                                                      {
+                                                                          { Headers.ProcessingEndpoint ,"TheEndpoint"}
+                                                                      });
+            Assert.AreEqual("TheEndpoint",message.ProcessingEndpointName());
+        }
+
+        [Test]
+        public void With_FailedQ_header_should_return_FailedQ()
+        {
+            var message = new TransportMessage(Guid.Empty.ToString(), new Dictionary<string, string>
+                                                                      {
+                                                                          { "NServiceBus.FailedQ" ,"TheEndpoint"}
+                                                                      });
+            Assert.AreEqual("TheEndpoint",message.ProcessingEndpointName());
+        }
+
+        [Test]
+        public void With_ReplyToAddress_should_return_ReplyToAddress()
+        {
+            var message = new TransportMessage
+                          {
+                              ReplyToAddress = new Address("TheEndpoint", "")
+                          };
+            Assert.AreEqual("TheEndpoint",message.ProcessingEndpointName());
+        }
+    }
+}

src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj

@@ -96,6 +96,7 @@
     <Compile Include="Infrastructure\RavenDB\Indexes\InMemoryStoreBuilder.cs" />
     <Compile Include="Infrastructure\RavenDB\RavenBootstrapperTests.cs" />
     <Compile Include="Infrastructure\RavenDB\TestWithRavenDB.cs" />
+    <Compile Include="Infrastructure\TransportMessageExtensionsTests.cs" />
     <Compile Include="Operations\UpdateLicenseEnricherTest.cs" />
   </ItemGroup>
   <ItemGroup>

src/ServiceControl/CustomChecks/CustomCheckNotifications.cs

@@ -0,0 +1,85 @@
+namespace ServiceControl.CustomChecks
+{
+    using System;
+    using System.Linq;
+    using System.Reactive.Concurrency;
+    using System.Reactive.Linq;
+    using NServiceBus;
+    using NServiceBus.Logging;
+    using Raven.Abstractions.Data;
+    using Raven.Client;
+    using INeedInitialization = NServiceBus.INeedInitialization;
+
+    public class CustomCheckNotifications : INeedInitialization, IWantToRunWhenBusStartsAndStops, IObserver<IndexChangeNotification>
+    {
+        IDocumentStore store;
+        IBus bus;
+        int lastCount;
+        IDisposable subscription;
+        ILog logging = LogManager.GetLogger(typeof(CustomCheckNotifications));
+    
+        public CustomCheckNotifications()
+        {
+            // Need this because INeedInitialization does not use DI instead use Activator.CreateInstance
+        }
+
+        public CustomCheckNotifications(IDocumentStore store, IBus bus)
+        {
+            this.bus = bus;
+            this.store = store;
+        }
+
+        public void Init()
+        {
+            Configure.Component<CustomCheckNotifications>(DependencyLifecycle.SingleInstance);
+        }
+
+        public void OnNext(IndexChangeNotification value)
+        {
+           UpdateCount();
+        }
+
+        void UpdateCount()
+        {
+            try
+            {
+                using (var session = store.OpenSession())
+                {
+                    var failedCustomCheckCount = session.Query<CustomCheck, CustomChecksIndex>().Count(p => p.Status == Status.Fail);
+                    if (lastCount == failedCustomCheckCount)
+                        return;
+                    lastCount = failedCustomCheckCount;
+                    bus.Publish(new CustomChecksUpdated
+                    {
+                        Failed = lastCount
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                logging.WarnFormat("Failed to emit CustomCheckUpdated - {0}", ex);
+            }
+
+        }
+
+        public void OnError(Exception error)
+        {
+            //Ignore
+        }
+
+        public void OnCompleted()
+        {
+            //Ignore
+        }
+
+        public void Start()
+        {
+            subscription = store.Changes().ForIndex("CustomChecksIndex").SubscribeOn(Scheduler.Default).Subscribe(this);
+        }
+
+        public void Stop()
+        {
+            subscription.Dispose();
+        }
+    }
+}

src/ServiceControl/CustomChecks/CustomChecksComputation.cs

@@ -15,8 +15,7 @@ public EventLogApiModule()
                 using (var session = Store.OpenSession())
                 {
                     RavenQueryStatistics stats;
-                    var results = session.Query<EventLogItem>()
-                        .Statistics(out stats)
+                    var results = session.Query<EventLogItem>().Statistics(out stats).OrderByDescending(p => p.RaisedAt)
                         .ToArray();
 
                     return Negotiate.WithModel(results)

src/ServiceControl/CustomChecks/RaiseCustomCheckChanges.cs

@@ -21,8 +21,8 @@
     [ExportMetadata("Bundle", "customDocumentExpiration")]
     public class ExpiredDocumentsCleaner : IStartupTask, IDisposable
     {
-        private readonly ILog logger = LogManager.GetLogger(typeof(ExpiredDocumentsCleaner));
-        private Timer timer;
+        ILog logger = LogManager.GetLogger(typeof(ExpiredDocumentsCleaner));
+        Timer timer;
         DocumentDatabase Database { get; set; }
         string indexName;
         int deleteFrequencyInSeconds;
@@ -75,13 +75,12 @@ void TimerCallback(object state)
                 },
             };
 
-            var docsToExpire = 0;
-            var stopwatch = Stopwatch.StartNew();
             try
             {
+                var docsToExpire = 0;
                 // we may be receiving a LOT of documents to delete, so we are going to skip
                 // the cache for that, to avoid filling it up very quickly
-
+                var stopwatch = Stopwatch.StartNew();
                 int deletionCount;
                 using (DocumentCacher.SkipSettingDocumentsInDocumentCache())
                 using (Database.DisableAllTriggersForCurrentThread())
@@ -94,7 +93,9 @@ void TimerCallback(object state)
                         doc =>
                         {
                             if (documentWithCurrentThresholdTimeReached)
+                            {
                                 return;
+                            }
 
                             if (doc.Value<DateTime>("ProcessedAt") >= currentExpiryThresholdTime)
                             {
@@ -137,10 +138,6 @@ void TimerCallback(object state)
             }
             finally
             {
-                if (stopwatch.IsRunning)
-                {
-                    stopwatch.Stop();
-                }
                 try
                 {
                     timer.Change(TimeSpan.FromSeconds(deleteFrequencyInSeconds), Timeout.InfiniteTimeSpan);

src/ServiceControl/EventLog/EventLogApiModule.cs

@@ -204,8 +204,7 @@ public static int ExpirationProcessBatchSize
             set { expirationProcessBatchSize = value; }
         }
 
-        public static bool RandomizeProcessedAtDate = SettingsReader<bool>.Read("RandomizeProcessedAtDate");
-
+      
         static readonly ILog Logger = LogManager.GetLogger(typeof(Settings));
         public static string ServiceName;