implemented all the IExecutionLogger strategies

DarthFubuMVC · Aug 25, 2015 · 55b7995 · 55b7995
1 parent 84fdb8d
commit 55b7995
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 35 deletions.
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/ChainExecutionLog.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/ChainExecutionLog.cs
@@ -112,5 +112,15 @@ public void Trace(string description, Action action)
                 Duration = finish - start
             });
         }
+
+        public void RecordHeaders(IDictionary<string, object> env)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RecordBody(IDictionary<string, object> env)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/IChainExecutionLog.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/IChainExecutionLog.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
@@ -9,5 +10,7 @@ public interface IChainExecutionLog
         void LogException(Exception ex);
         void AddLog(object log);
         void Trace(string description, Action action);
+        void RecordHeaders(IDictionary<string, object> env);
+        void RecordBody(IDictionary<string, object> env);
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/IExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/IExecutionLogger.cs
@@ -7,51 +7,21 @@ namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
     public interface IExecutionLogger
     {
-        void Record(ChainExecutionLog log, IDictionary<string, object> http);
+        void Record(IChainExecutionLog log, IDictionary<string, object> http);
     }
 
 
     public class NulloExecutionLogger : IExecutionLogger
     {
-        public void Record(ChainExecutionLog log, IDictionary<string, object> http)
+        public void Record(IChainExecutionLog log, IDictionary<string, object> http)
         {
             // no-op
         }
     }
 
-    public class VerboseExecutionLogger : IExecutionLogger
-    {
-        private readonly IExecutionLogStorage _storage;
-
-        public VerboseExecutionLogger(IExecutionLogStorage storage)
-        {
-            _storage = storage;
-        }
-
-        public void Record(ChainExecutionLog log, IDictionary<string, object> http)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class ProductionExecutionLogger : IExecutionLogger
-    {
-        private readonly IExecutionLogStorage _storage;
-
-        public ProductionExecutionLogger(IExecutionLogStorage storage)
-        {
-            _storage = storage;
-        }
-
-        public void Record(ChainExecutionLog log, IDictionary<string, object> http)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
     public interface IExecutionLogStorage
     {
-        void Store(ChainExecutionLog log);
+        void Store(IChainExecutionLog log);
         void Start();
     }
 
@@ -90,9 +60,9 @@ public void Start()
             _readingTask = Task.Factory.StartNew(record);
         }
 
-        void IExecutionLogStorage.Store(ChainExecutionLog log)
+        void IExecutionLogStorage.Store(IChainExecutionLog log)
         {
-            Enqueue(log);
+            Enqueue((ChainExecutionLog) log);
         }
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/ProductionExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/ProductionExecutionLogger.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace FubuMVC.Core.Diagnostics.Instrumentation
+{
+    public class ProductionExecutionLogger : IExecutionLogger
+    {
+        private readonly IExecutionLogStorage _storage;
+
+        public ProductionExecutionLogger(IExecutionLogStorage storage)
+        {
+            _storage = storage;
+        }
+
+        public void Record(IChainExecutionLog log, IDictionary<string, object> http)
+        {
+            log.RecordHeaders(http);
+            _storage.Store(log);
+        }
+    }
+}
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/VerboseExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/VerboseExecutionLogger.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace FubuMVC.Core.Diagnostics.Instrumentation
+{
+    public class VerboseExecutionLogger : IExecutionLogger
+    {
+        private readonly IExecutionLogStorage _storage;
+
+        public VerboseExecutionLogger(IExecutionLogStorage storage)
+        {
+            _storage = storage;
+        }
+
+        public void Record(IChainExecutionLog log, IDictionary<string, object> http)
+        {
+            log.RecordHeaders(http);
+            log.RecordBody(http);
+
+            _storage.Store(log);
+        }
+    }
+}
diff --git a/src/FubuMVC.Core/FubuMVC.Core.csproj b/src/FubuMVC.Core/FubuMVC.Core.csproj
@@ -86,8 +86,10 @@
     <Compile Include="Diagnostics\Instrumentation\IRequestLog.cs" />
     <Compile Include="Diagnostics\Instrumentation\ISubject.cs" />
     <Compile Include="Diagnostics\Instrumentation\PerformanceHistory.cs" />
+    <Compile Include="Diagnostics\Instrumentation\ProductionExecutionLogger.cs" />
     <Compile Include="Diagnostics\Instrumentation\RequestStep.cs" />
     <Compile Include="Diagnostics\Instrumentation\Trace.cs" />
+    <Compile Include="Diagnostics\Instrumentation\VerboseExecutionLogger.cs" />
     <Compile Include="FubuModeExtensions.cs" />
     <Compile Include="Http\Compression\ApplyCompression.cs" />
     <Compile Include="Http\Hosting\IHost.cs" />

diff --git a/src/FubuMVC.Tests/Diagnostics/Instrumentation/ProductionExecutionLoggerTester.cs b/src/FubuMVC.Tests/Diagnostics/Instrumentation/ProductionExecutionLoggerTester.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using FubuMVC.Core.Diagnostics.Instrumentation;
+using FubuMVC.Tests.TestSupport;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace FubuMVC.Tests.Diagnostics.Instrumentation
+{
+    [TestFixture]
+    public class ProductionExecutionLoggerTester : InteractionContext<ProductionExecutionLogger>
+    {
+        [Test]
+        public void record()
+        {
+            var log = MockFor<IChainExecutionLog>();
+            var env = new Dictionary<string, object>();
+
+            ClassUnderTest.Record(log, env);
+
+            log.AssertWasCalled(x => x.RecordHeaders(env));
+            log.AssertWasNotCalled(x => x.RecordBody(env));
+
+            MockFor<IExecutionLogStorage>().AssertWasCalled(x => x.Store(log));
+        }
+    }
+}
diff --git a/src/FubuMVC.Tests/Diagnostics/Instrumentation/VerboseExecutionLoggerTester.cs b/src/FubuMVC.Tests/Diagnostics/Instrumentation/VerboseExecutionLoggerTester.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using FubuMVC.Core.Diagnostics.Instrumentation;
+using FubuMVC.Tests.TestSupport;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace FubuMVC.Tests.Diagnostics.Instrumentation
+{
+    [TestFixture]
+    public class VerboseExecutionLoggerTester : InteractionContext<VerboseExecutionLogger>
+    {
+        [Test]
+        public void record()
+        {
+            var log = MockFor<IChainExecutionLog>();
+            var env = new Dictionary<string, object>();
+
+            ClassUnderTest.Record(log, env);
+
+            log.AssertWasCalled(x => x.RecordHeaders(env));
+            log.AssertWasCalled(x => x.RecordBody(env));
+
+            MockFor<IExecutionLogStorage>().AssertWasCalled(x => x.Store(log));
+        }
+    }
+}
diff --git a/src/FubuMVC.Tests/FubuMVC.Tests.csproj b/src/FubuMVC.Tests/FubuMVC.Tests.csproj
@@ -108,6 +108,8 @@
     <Compile Include="Diagnostics\Instrumentation\BehaviorTracerTester.cs" />
     <Compile Include="Diagnostics\Instrumentation\ChainExecutionLogTester.cs" />
     <Compile Include="Diagnostics\Instrumentation\PerformanceHistoryTester.cs" />
+    <Compile Include="Diagnostics\Instrumentation\ProductionExecutionLoggerTester.cs" />
+    <Compile Include="Diagnostics\Instrumentation\VerboseExecutionLoggerTester.cs" />
     <Compile Include="Diagnostics\InteractionContextExtensions.cs" />
     <Compile Include="Diagnostics\PerfTimerSmokeTester.cs" />
     <Compile Include="Diagnostics\Routes\EndpointReportTester.cs" />