Merge pull request #45 from datalust/dev

Release
datalust · Feb 13, 2019 · b604114 · b604114
2 parents 2bee59e + b986316
commit b604114
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/Seq.Forwarder/Cli/Commands/RunCommand.cs b/src/Seq.Forwarder/Cli/Commands/RunCommand.cs
@@ -172,7 +172,7 @@ static void WriteBanner()
             Console.WriteLine();
             Write(" Seq Forwarder", ConsoleColor.White);
             Write(" ──", ConsoleColor.DarkGray);
-            Write(" © 2017 Datalust Pty Ltd", ConsoleColor.Gray);
+            Write(" © 2019 Datalust Pty Ltd", ConsoleColor.Gray);
             Console.WriteLine();
             Write("─", ConsoleColor.DarkGray, 47);
             Console.WriteLine();

diff --git a/src/Seq.Forwarder/Multiplexing/ActiveLogBufferMap.cs b/src/Seq.Forwarder/Multiplexing/ActiveLogBufferMap.cs
@@ -15,9 +15,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Nancy;
 using Seq.Forwarder.Config;
 using Seq.Forwarder.Storage;
 using Seq.Forwarder.Util;
+using Seq.Forwarder.Web;
 using Serilog;
 
 namespace Seq.Forwarder.Multiplexing
@@ -33,6 +35,7 @@ class ActiveLogBufferMap : IDisposable
         readonly ILogger _log = Log.ForContext<ActiveLogBufferMap>();
 
         readonly object _sync = new object();
+        bool _loaded;
         ActiveLogBuffer _noApiKeyLogBuffer;
         readonly Dictionary<string, ActiveLogBuffer> _buffersByApiKey = new Dictionary<string, ActiveLogBuffer>();
 
@@ -55,6 +58,8 @@ public void Load()
 
             lock (_sync)
             {
+                if (_loaded) throw new InvalidOperationException("The log buffer map is already loaded.");
+
                 Directory.CreateDirectory(_bufferPath);
 
                 var defaultDataFilePath = Path.Combine(_bufferPath, DataFileName);
@@ -102,13 +107,17 @@ public void Load()
                         _buffersByApiKey.Add(apiKey, activeBuffer);
                     }
                 }
+
+                _loaded = true;
             }
         }
 
         public void Start()
         {
             lock (_sync)
             {
+                if (!_loaded) throw new InvalidOperationException("The log buffer map is not loaded.");
+
                 foreach (var buffer in OpenBuffers)
                 {
                     buffer.Shipper.Start();
@@ -120,6 +129,9 @@ public void Stop()
         {
             lock (_sync)
             {
+                // Hard to ensure _loaded is set in all cases, better here to be forgiving and
+                // permit a clean shut-down.
+
                 foreach (var buffer in OpenBuffers)
                 {
                     buffer.Shipper.Stop();
@@ -131,6 +143,8 @@ public LogBuffer GetLogBuffer(string apiKey)
         {
             lock (_sync)
             {
+                if (!_loaded) throw new BadRequestException("The forwarder service is starting up.", HttpStatusCode.ServiceUnavailable);
+
                 if (apiKey == null)
                 {
                     if (_noApiKeyLogBuffer == null)

diff --git a/src/Seq.Forwarder/ServiceProcess/ServerService.cs b/src/Seq.Forwarder/ServiceProcess/ServerService.cs
@@ -24,7 +24,7 @@ class ServerService
     {
         readonly Lazy<ActiveLogBufferMap> _logBufferMap;
         readonly NancyHost _nancyHost;
-        string _listenUri;
+        readonly string _listenUri;
 
         public ServerService(NancyBootstrapper bootstrapper, Lazy<ActiveLogBufferMap> logBufferMap, string listenUri)
         {