Merge pull request #62 from nkot/httpendpoint-does-not-throw

HttpListener.Stop() will not throw if it is not initialized

Src/Metrics.Tests/Metrics.Tests.csproj

@@ -105,6 +105,7 @@
  <Compile Include="Core\DefaultContextCustomMetricsTests.cs" />
  <Compile Include="Core\MetricTagsTests.cs" />
  <Compile Include="Json\JsonSerializationTests.cs" />
+ <Compile Include="MetricsConfigTests\HttpEndpointTests.cs" />
  <Compile Include="Metrics\CounterMetricTests.cs" />
  <Compile Include="Metrics\GaugeMetricTests.cs" />
  <Compile Include="Sampling\WeightedSnapshotTests.cs" />

Src/Metrics.Tests/MetricsConfigTests/HttpEndpointTests.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+using Metrics;
+using System.Net.NetworkInformation;
+using System.Collections;
+using System.Net;
+
+namespace Metrics.Tests.MetricsConfigTests
+{
+ public class HttpEndpointTests
+ {
+
+ [Fact]
+ public void HttpEndpointCanBeDisposed()
+ {
+ var config = Metric.Config.WithHttpEndpoint("http:https://localhost:58888/metricstest/HttpListenerTests/HttpEndpointCanBeDisposed/");
+ config.Dispose();
+ }
+
+ [Fact]
+ public void HttpEndpointDoesNotThrowIfPortIsOccupied()
+ {
+ using (var listener = new HttpListener())
+ {
+ listener.Prefixes.Add("http:https://localhost:58888/metricstest/HttpListenerTests/OccupiedPort/");
+ listener.Start();
+
+ Metric.Config.WithHttpEndpoint("http:https://localhost:58888/metricstest/HttpListenerTests/OccupiedPort/");
+ listener.Close();
+ }
+ }
+
+ [Fact]
+ public void HttpEndportLogsAnErrorIfPortIsOccupied()
+ {
+ using (var listener = new HttpListener())
+ {
+ listener.Prefixes.Add("http:https://localhost:58888/metricstest/HttpListenerTests/OccupiedPort/");
+ listener.Start();
+
+ var loggedAnError = false;
+ var config = Metric.Config;
+ config.WithErrorHandler((exception, s) => { loggedAnError = true; }, true);
+ config.WithErrorHandler((exception) => { loggedAnError = true; }, true);
+
+ config.WithHttpEndpoint("http:https://localhost:58888/metricstest/HttpListenerTests/OccupiedPort/");
+ Assert.True(loggedAnError);
+ listener.Close();
+ }
+ }
+
+ [Fact]
+ public void SecondCallToWithHttpEndportDoesNotThrow()
+ {
+ var config = Metric.Config.WithHttpEndpoint("http:https://localhost:58888/metricstest/HttpListenerTests/sameendpoint/");
+ config.WithHttpEndpoint("http:https://localhost:58888/metricstest/HttpListenerTests/sameendpoint/");
+ }
+
+ [Fact]
+ public void HttpEndpointDoesNotThrowOnDispose()
+ {
+ using (var listener = new HttpListener())
+ {
+ listener.Prefixes.Add("http:https://localhost:58888/metricstest/HttpListenerTests/OccupiedPort/");
+ listener.Start();
+
+ var config = Metric.Config.WithHttpEndpoint("http:https://localhost:58888/metricstest/HttpListenerTests/OccupiedPort/");
+ config.Dispose();
+ listener.Close();
+ }
+ }
+
+ }
+}

Src/Metrics/Visualization/MetricsHttpListener.cs

@@ -269,11 +269,14 @@ private static void AddCORSHeaders(HttpListenerResponse response)
  response.Headers.Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
  }
 
- public void Stop()
+ private void Stop()
  {
  cts.Cancel();
- this.httpListener.Stop();
- this.httpListener.Prefixes.Clear();
+ if (this.httpListener.IsListening)
+ {
+ this.httpListener.Stop();
+ this.httpListener.Prefixes.Clear();
+ }
  if (processingTask != null && !processingTask.IsCompleted)
  {
  processingTask.Wait();