from @bstauff - Bring options monitor into LoggerProvider (#37)

* I guess we need this afterall?

* removeing the ILoggerFactory interactions to properly introduce the options

* final cleanups

Co-authored-by: Brian Stauff <[email protected]>

Author: Alex McCool

src/ElasticLogger.Test/ESFixture.cs

@@ -20,7 +20,8 @@ public ESFixture(IMessageSink messageSink)
 
             _elasticsearch = new ElasticsearchInside.Elasticsearch(c => c.SetElasticsearchStartTimeout(60)
                 .EnableLogging()
-                .LogTo(s => _messageSink.OnMessage(new Xunit.Sdk.DiagnosticMessage(s ?? string.Empty))));
+                .LogTo(s => _messageSink.OnMessage(new Xunit.Sdk.DiagnosticMessage(s ?? string.Empty)))
+                );
 
             _elasticsearch.ReadySync();
         }

src/ElasticLogger.Test/ElasticLogger.Test.csproj

@@ -10,13 +10,6 @@
     <PackageReference Include="elasticsearch-inside" Version="6.6.1" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.3" />
-    <!-- <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.*" /> -->
-
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="NEST" Version="6.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />

src/ElasticLogger.Test/ElasticsearchLoggerFilterTests.cs

@@ -86,7 +86,7 @@ public async Task No_categories_for_es_should_use_default()
 
 
         [Fact]
-        public async Task configured_categories_dont_log_for_config()
+        public async Task Configured_categories_dont_log_for_config()
         {
             var source = "Billy.bob";
 
@@ -277,7 +277,6 @@ private async Task LevelTesterPositive(string source, LogLevel logLevel)
             var prov = services.BuildServiceProvider();
 
             var loggerFactory = prov.GetService<ILoggerFactory>();
-
             var logger = loggerFactory.CreateLogger(source);
 
             var circularRefObj = new Circle();

src/ElasticLogger.Test/MiscTests.cs

@@ -16,13 +16,9 @@ public MiscTests(ITestOutputHelper outputHelper)
             _output = outputHelper;
         }
 
-
-
         [Fact]
         public async Task TryingToBreakThisThing()
         {
-            JsonSerializerSettings settings = new JsonSerializerSettings { };
-
             Circle sillyCircle = new Circle{me = null};
             sillyCircle.me = sillyCircle;
 
@@ -34,7 +30,7 @@ public async Task TryingToBreakThisThing()
 
             var reader = new StreamReader(stream);
 
-            var huh = await reader.ReadToEndAsync();
+            await reader.ReadToEndAsync();
         }
 
         [Fact(Skip ="issues with hosting")]

src/ElasticLogger.Test/Startup.cs

@@ -14,11 +14,11 @@ class Startup
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            //services.AddMvc();
+            services.AddMvc();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
             app.Use(async (context, next) =>
             {

src/ElasticSearch.Extensions.Logging/ElasticSearchLogger.cs

@@ -107,7 +107,6 @@ protected void WriteTrace(
                 {
                     updatedMessage = ((Exception)data).Message;
 
-
                     payload = JObject.FromObject(data, serializerIgnoreReferenceLoop);
                 }
                 else if (data is XPathNavigator)
@@ -232,15 +231,11 @@ private void InternalWrite(
 
                 _scribeProcessor(jo);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 //this is of questionable value
                 //Debug.WriteLine(ex.Message);
             }
         }
-
-
-
-
     }
 }

src/ElasticSearch.Extensions.Logging/ElasticSearchLoggerProvider.cs

@@ -17,44 +17,44 @@ namespace AM.Extensions.Logging.ElasticSearch
     public class ElasticsearchLoggerProvider : ILoggerProvider
     {
         #region fields
+        private readonly IOptionsMonitor<ElasticsearchLoggerOptions> _optionsMonitor;
         private IElasticLowLevelClient _client;
-        private readonly Uri _endpoint;
-        private readonly string _indexPrefix;
         private readonly BlockingCollection<JObject> _queueToBePosted = new BlockingCollection<JObject>();
-
         private const string DocumentType = "doc";
         private Action<JObject> _scribeProcessor;
-
         #endregion
 
-
-
         /// <summary>
         /// prefix for the Index for traces
         /// </summary>
-        private string Index => this._indexPrefix.ToLower() + "-" + DateTime.UtcNow.ToString("yyyy-MM-dd-HH");
-
+        private string Index => _optionsMonitor.CurrentValue.IndexName.ToLower() + "-" + DateTime.UtcNow.ToString("yyyy-MM-dd-HH");
 
-        public ElasticsearchLoggerProvider(IOptions<ElasticsearchLoggerOptions> options) : this(options.Value)
-        { }
 
-        public ElasticsearchLoggerProvider(ElasticsearchLoggerOptions options)
+        public ElasticsearchLoggerProvider(IOptionsMonitor<ElasticsearchLoggerOptions> optionsMonitor)
         {
-            _endpoint = options.ElasticsearchEndpoint;
-            _indexPrefix = options.IndexName;
+            if(optionsMonitor == null)
+            {
+                throw new ArgumentNullException(nameof(optionsMonitor));
+            }
+            _optionsMonitor = optionsMonitor;
+
+            _optionsMonitor.OnChange(UpdateClientWithNewOptions);
 
-            //build the client
-            //build the batcher
             Initialize();
+        }
 
+        private void UpdateClientWithNewOptions(ElasticsearchLoggerOptions newOptions)
+        {
+            var newClient = CreateNewElasticLowLevelClient(newOptions.ElasticsearchEndpoint);
+
+            _client = newClient;
         }
 
         public ILogger CreateLogger(string categoryName)
         {
             return new ElasticsearchLogger(categoryName, _scribeProcessor);
         }
 
-
         public IElasticLowLevelClient Client
         {
             get
@@ -65,22 +65,25 @@ public IElasticLowLevelClient Client
                 }
                 else
                 {
-                    var singleNode = new SingleNodeConnectionPool(_endpoint);
-
-                    var cc = new ConnectionConfiguration(singleNode, new ElasticsearchJsonNetSerializer())
-                    .EnableHttpPipelining()
-                    .EnableHttpCompression()
-                    .ThrowExceptions();
-
-                    //the 1.x serializer we needed to use, as the default SimpleJson didnt work right
-                    //Elasticsearch.Net.JsonNet.ElasticsearchJsonNetSerializer()
+                    this._client = CreateNewElasticLowLevelClient(_optionsMonitor.CurrentValue.ElasticsearchEndpoint);
 
-                    this._client = new ElasticLowLevelClient(cc);
                     return this._client;
                 }
             }
         }
 
+        private ElasticLowLevelClient CreateNewElasticLowLevelClient(Uri elasticSearchEndpoint)
+        {
+            var singleNode = new SingleNodeConnectionPool(_optionsMonitor.CurrentValue.ElasticsearchEndpoint);
+
+            var cc = new ConnectionConfiguration(singleNode, new ElasticsearchJsonNetSerializer())
+            .EnableHttpPipelining()
+            .EnableHttpCompression()
+            .ThrowExceptions();
+
+            return new ElasticLowLevelClient(cc);
+        }
+
         private void Initialize()
         {
             //setup a flag in config to chose
@@ -141,7 +144,7 @@ await Client.BulkPutAsync<VoidResponse>(Index, DocumentType,
                     PostData.MultiJson(bbo.ToArray()), 
                     new BulkRequestParameters { Refresh = Refresh.False });
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 //eat the exception, we cant really do much with it anyways
                 //Debug.WriteLine(ex.Message);
@@ -153,21 +156,6 @@ private void WriteToQueueForProcessing(JObject jo)
             this._queueToBePosted.Add(jo);
         }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         #region IDisposable Support
         private bool disposedValue = false; // To detect redundant calls