remove useHttps from Kestrel. refactor HttpListener

Author: phnx47

src/Prometheus.Client.MetricServer/IMetricServer.cs

@@ -14,5 +14,10 @@ public interface IMetricServer
         ///     Stop server
         /// </summary>
         void Stop();
+        
+        /// <summary>
+        ///     Server is Running?
+        /// </summary>
+        bool IsRunning { get; }
     }
 }

src/Prometheus.Client.MetricServer/MetricServer.HttpListener.cs

@@ -15,68 +15,84 @@ namespace Prometheus.Client.MetricServer
     public class MetricServer : BaseMetricServer, IMetricServer
     {
         private readonly HttpListener _httpListener = new HttpListener();
-        private Thread _bgThread;
-        private bool _isListening;
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(int port, bool useHttps = false)
+        public MetricServer(int port)
+            : this(port, false)
+        {
+        }
+
+        /// <summary>
+        ///     Constructor
+        /// </summary>
+        public MetricServer(int port, bool useHttps)
             : this(Consts.DefaultHost, port, Consts.DefaultUrl, null, null, useHttps)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(string host, int port, bool useHttps = false)
+        public MetricServer(string host, int port)
+            : this(host, port, false)
+        {
+        }
+
+        /// <summary>
+        ///     Constructor
+        /// </summary>
+        public MetricServer(string host, int port, bool useHttps)
             : this(host, port, Consts.DefaultUrl, null, null, useHttps)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(string host, int port, string url, bool useHttps = false)
+        public MetricServer(string host, int port, string url, bool useHttps)
             : this(host, port, url, null, null, useHttps)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(string hostname, int port, string url, IEnumerable<IOnDemandCollector> standardCollectors = null, ICollectorRegistry registry = null, bool useHttps = false)
+        public MetricServer(string hostname, int port, string url, IEnumerable<IOnDemandCollector> standardCollectors, ICollectorRegistry registry, bool useHttps)
             : base(standardCollectors, registry)
         {
-            var s = useHttps ? "s" : "";
-            _httpListener.Prefixes.Add($"http{s}://{hostname}:{port}/{url}");
+            _httpListener.Prefixes.Add($"http{(useHttps ? "s" : "")}://{hostname}:{port}/{url}");
         }
 
         /// <inheritdoc />
         public void Start()
         {
-            _bgThread = new Thread(StartListen)
+            var bgThread = new Thread(StartListen)
             {
                 IsBackground = true,
                 Name = "MetricServer"
             };
-            _bgThread.Start();
+            bgThread.Start();
         }
 
+        /// <inheritdoc />
+        public bool IsRunning { get; private set; }
+
         /// <inheritdoc />
         public void Stop()
         {
-            _isListening = false;
+            IsRunning = false;
             _httpListener.Stop();
             _httpListener.Close();
         }
 
         private void StartListen()
         {
             _httpListener.Start();
-            _isListening = true;
+            IsRunning = true;
 
-            while (_isListening)
+            while (IsRunning)
             {
                 try
                 {

src/Prometheus.Client.MetricServer/MetricServer.Kestrel.cs

@@ -23,71 +23,62 @@ public class MetricServer : BaseMetricServer, IMetricServer
         private readonly string _hostName;
         private readonly int _port;
         private readonly string _url;
-        private readonly bool _useHttps;
         private IWebHost _host;
-
-
+        
         /// <summary>
         ///     Constructor
         /// </summary>
         public MetricServer(int port)
-            : this(Consts.DefaultHost, port, Consts.DefaultUrl, null, null, null, false)
+            : this(Consts.DefaultHost, port, Consts.DefaultUrl, null, null, null)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
         public MetricServer(string host, int port)
-            : this(host, port, Consts.DefaultUrl, null, null, null, false)
+            : this(host, port, Consts.DefaultUrl, null, null, null)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(int port, X509Certificate2 certificate, bool useHttps)
-            : this(Consts.DefaultHost, port, Consts.DefaultUrl, null, null, certificate, useHttps)
+        public MetricServer(int port, X509Certificate2 certificate)
+            : this(Consts.DefaultHost, port, Consts.DefaultUrl, null, null, certificate)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(string host, int port, X509Certificate2 certificate, bool useHttps)
-            : this(host, port, Consts.DefaultUrl, null, null, certificate, useHttps)
+        public MetricServer(string host, int port, X509Certificate2 certificate)
+            : this(host, port, Consts.DefaultUrl, null, null, certificate)
         {
         }
 
         /// <summary>
         ///     Constructor
         /// </summary>
         public MetricServer(string host, int port, string url, IEnumerable<IOnDemandCollector> standardCollectors, ICollectorRegistry registry)
-            : this(host, port, url, standardCollectors, registry, null, false)
+            : this(host, port, url, standardCollectors, registry, null)
         {
         }
 
 
         /// <summary>
         ///     Constructor
         /// </summary>
-        public MetricServer(string host, int port, string url, IEnumerable<IOnDemandCollector> standardCollectors, ICollectorRegistry registry, X509Certificate2 certificate,
-            bool useHttps)
+        public MetricServer(string host, int port, string url, IEnumerable<IOnDemandCollector> standardCollectors, ICollectorRegistry registry, X509Certificate2 certificate)
             : base(standardCollectors, registry)
         {
-            if (useHttps && certificate == null)
-                throw new ArgumentNullException(nameof(certificate), $"{nameof(certificate)} is required when using https");
-
-            _useHttps = useHttps;
             _certificate = certificate;
             _port = port;
             _hostName = host;
             _url = url;
         }
 
-        /// <summary>
-        ///     Server is Running?
-        /// </summary>
+        /// <inheritdoc />
         public bool IsRunning => _host != null;
 
         /// <inheritdoc />
@@ -106,16 +97,16 @@ public void Start()
                 .UseKestrel(options =>
                 {
 #if NETSTANDARD13
-                    if (_useHttps)
+                    if (_certificate != null)
                         options.UseHttps(_certificate);
 #endif
 
 #if NETSTANDARD20
-                    if (_useHttps)
+                    if (_certificate != null)
                         options.Listen(IPAddress.Any, _port, listenOptions => { listenOptions.UseHttps(_certificate); });
 #endif
                 })
-                .UseUrls($"http{(_useHttps ? "s" : "")}://{_hostName}:{_port}")
+                .UseUrls($"http{(_certificate != null ? "s" : "")}://{_hostName}:{_port}")
                 .ConfigureServices(services => { services.AddSingleton<IStartup>(new Startup(Registry, _url)); })
                 .UseSetting(WebHostDefaults.ApplicationKey, typeof(Startup).GetTypeInfo().Assembly.FullName)
                 .Build();