From de76156391655f726b5655f727e06822398827ca Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 18 Jan 2015 23:29:57 -0500
Subject: rework hosting options

---
 MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs | 7 +++----
 .../HttpServer/SocketSharp/WebSocketSharpListener.cs               | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 7022dc76d..f64e29e4d 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Implementations.HttpServer.NetListener;
 using MediaBrowser.Server.Implementations.HttpServer.SocketSharp;
 using ServiceStack;
 using ServiceStack.Api.Swagger;
@@ -41,7 +40,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private readonly ReaderWriterLockSlim _localEndpointLock = new ReaderWriterLockSlim();
 
-        private string _certificatePath;
+        public string CertificatePath { get; private set; }
 
         /// <summary>
         /// Gets the local end points.
@@ -206,7 +205,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private IHttpListener GetListener()
         {
-            return new WebSocketSharpListener(_logger, OnRequestReceived, _certificatePath);
+            return new WebSocketSharpListener(_logger, OnRequestReceived, CertificatePath);
         }
 
         private void WebSocketHandler(WebSocketConnectEventArgs args)
@@ -434,7 +433,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         public void StartServer(IEnumerable<string> urlPrefixes, string certificatePath)
         {
-            _certificatePath = certificatePath;
+            CertificatePath = certificatePath;
             UrlPrefixes = urlPrefixes.ToList();
             Start(UrlPrefixes.First());
         }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index 1cf523ad2..0c5c9e9bf 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -3,12 +3,12 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Implementations.Logging;
 using ServiceStack;
 using ServiceStack.Web;
+using SocketHttpListener.Net;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using SocketHttpListener.Net;
 
 namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 {
-- 
cgit v1.2.3