diff --git a/src/NServiceBus.Core/Gateway/Channels/Http/HttpChannelReceiver.cs b/src/NServiceBus.Core/Gateway/Channels/Http/HttpChannelReceiver.cs index cc78bd8ce3..aafce622eb 100644 --- a/src/NServiceBus.Core/Gateway/Channels/Http/HttpChannelReceiver.cs +++ b/src/NServiceBus.Core/Gateway/Channels/Http/HttpChannelReceiver.cs @@ -18,15 +18,14 @@ public class HttpChannelReceiver : IChannelReceiver { public event EventHandler DataReceived; - public void Start(string address, int numWorkerThreads) + public void Start(string address, int numberOfWorkerThreads) { tokenSource = new CancellationTokenSource(); listener = new HttpListener(); listener.Prefixes.Add(address); - scheduler = new MTATaskScheduler(numWorkerThreads, - String.Format("NServiceBus Gateway Channel Receiver Thread for [{0}]", address)); + scheduler = new MTATaskScheduler(numberOfWorkerThreads, String.Format("NServiceBus Gateway Channel Receiver Thread for [{0}]", address)); try { @@ -34,9 +33,8 @@ public void Start(string address, int numWorkerThreads) } catch (Exception ex) { - throw new Exception( - string.Format("Failed to start listener for {0} make sure that you have admin privileges", address), - ex); + var message = string.Format("Failed to start listener for {0} make sure that you have admin privileges", address); + throw new Exception(message,ex); } var token = tokenSource.Token; @@ -58,49 +56,49 @@ public void Dispose() disposed = true; } - public void Handle(HttpListenerContext ctx) + public void Handle(HttpListenerContext context) { try { - if (!IsGatewayRequest(ctx.Request)) + if (!IsGatewayRequest(context.Request)) { //there will always be a responder - Configure.Instance.Builder.Build().Handle(ctx); + Configure.Instance.Builder.Build().Handle(context); return; } DataReceived(this, new DataReceivedOnChannelArgs { - Headers = GetHeaders(ctx), - Data = GetMessageStream(ctx) + Headers = GetHeaders(context), + Data = GetMessageStream(context) }); - ReportSuccess(ctx); + ReportSuccess(context); Logger.Debug("Http request processing complete."); } catch (ChannelException ex) { - CloseResponseAndWarn(ctx, ex.Message, ex.StatusCode); + CloseResponseAndWarn(context, ex.Message, ex.StatusCode); } catch (Exception ex) { Logger.Error("Unexpected error", ex); - CloseResponseAndWarn(ctx, "Unexpected server error", 502); + CloseResponseAndWarn(context, "Unexpected server error", 502); } } - static MemoryStream GetMessageStream(HttpListenerContext ctx) + static MemoryStream GetMessageStream(HttpListenerContext context) { - if (ctx.Request.QueryString.AllKeys.Contains("Message")) + if (context.Request.QueryString.AllKeys.Contains("Message")) { - var message = HttpUtility.UrlDecode(ctx.Request.QueryString["Message"]); + var message = HttpUtility.UrlDecode(context.Request.QueryString["Message"]); return new MemoryStream(Encoding.UTF8.GetBytes(message)); } var streamToReturn = new MemoryStream(); - ctx.Request.InputStream.CopyTo(streamToReturn, MaximumBytesToRead); + context.Request.InputStream.CopyTo(streamToReturn, MaximumBytesToRead); streamToReturn.Position = 0; return streamToReturn; @@ -114,18 +112,18 @@ bool IsGatewayRequest(HttpListenerRequest request) } - static IDictionary GetHeaders(HttpListenerContext ctx) + static IDictionary GetHeaders(HttpListenerContext context) { var headers = new Dictionary(StringComparer.CurrentCultureIgnoreCase); - foreach (string header in ctx.Request.Headers.Keys) + foreach (string header in context.Request.Headers.Keys) { - headers.Add(HttpUtility.UrlDecode(header), HttpUtility.UrlDecode(ctx.Request.Headers[header])); + headers.Add(HttpUtility.UrlDecode(header), HttpUtility.UrlDecode(context.Request.Headers[header])); } - foreach (string header in ctx.Request.QueryString.Keys) + foreach (string header in context.Request.QueryString.Keys) { - headers[HttpUtility.UrlDecode(header)] = HttpUtility.UrlDecode(ctx.Request.QueryString[header]); + headers[HttpUtility.UrlDecode(header)] = HttpUtility.UrlDecode(context.Request.QueryString[header]); } return headers; @@ -140,8 +138,8 @@ void HttpServer(object o) { try { - var ctx = listener.GetContext(); - new Task(() => Handle(ctx)).Start(scheduler); + var context = listener.GetContext(); + new Task(() => Handle(context)).Start(scheduler); } catch (HttpListenerException ex) { @@ -156,43 +154,42 @@ void HttpServer(object o) } } - static void ReportSuccess(HttpListenerContext ctx) + static void ReportSuccess(HttpListenerContext context) { Logger.Debug("Sending HTTP 200 response."); - ctx.Response.StatusCode = 200; - ctx.Response.StatusDescription = "OK"; + context.Response.StatusCode = 200; + context.Response.StatusDescription = "OK"; - WriteData(ctx, "OK"); + WriteData(context, "OK"); } - static void WriteData(HttpListenerContext ctx, string status) + static void WriteData(HttpListenerContext context, string status) { - var str = status; + var newStatus = status; - var jsonp = ctx.Request.QueryString["callback"]; + var jsonp = context.Request.QueryString["callback"]; if (string.IsNullOrEmpty(jsonp) == false) { - str = jsonp + "({ status: '" + str + "'})"; - ctx.Response.AddHeader("Content-Type", "application/javascript; charset=utf-8"); + newStatus = jsonp + "({ status: '" + newStatus + "'})"; + context.Response.AddHeader("Content-Type", "application/javascript; charset=utf-8"); } else { - ctx.Response.AddHeader("Content-Type", "application/json; charset=utf-8"); + context.Response.AddHeader("Content-Type", "application/json; charset=utf-8"); } - ctx.Response.Close(Encoding.ASCII.GetBytes(str), false); + context.Response.Close(Encoding.ASCII.GetBytes(newStatus), false); } - static void CloseResponseAndWarn(HttpListenerContext ctx, string warning, int statusCode) + static void CloseResponseAndWarn(HttpListenerContext context, string warning, int statusCode) { try { - Logger.WarnFormat("Cannot process HTTP request from {0}. Reason: {1}.", ctx.Request.RemoteEndPoint, - warning); - ctx.Response.StatusCode = statusCode; - ctx.Response.StatusDescription = warning; + Logger.WarnFormat("Cannot process HTTP request from {0}. Reason: {1}.", context.Request.RemoteEndPoint, warning); + context.Response.StatusCode = statusCode; + context.Response.StatusDescription = warning; - WriteData(ctx, warning); + WriteData(context, warning); } catch (Exception e) { diff --git a/src/NServiceBus.Core/Gateway/Channels/IChannelReceiver.cs b/src/NServiceBus.Core/Gateway/Channels/IChannelReceiver.cs index d5c944abf2..af909ec1b9 100644 --- a/src/NServiceBus.Core/Gateway/Channels/IChannelReceiver.cs +++ b/src/NServiceBus.Core/Gateway/Channels/IChannelReceiver.cs @@ -8,7 +8,7 @@ public interface IChannelReceiver : IDisposable { event EventHandler DataReceived; - void Start(string address, int numWorkerThreads); + void Start(string address, int numberOfWorkerThreads); } public class DataReceivedOnChannelArgs : EventArgs diff --git a/src/NServiceBus.Core/Gateway/Receiving/IReceiveMessagesFromSites.cs b/src/NServiceBus.Core/Gateway/Receiving/IReceiveMessagesFromSites.cs index 5845a320bc..6c767d4bfb 100644 --- a/src/NServiceBus.Core/Gateway/Receiving/IReceiveMessagesFromSites.cs +++ b/src/NServiceBus.Core/Gateway/Receiving/IReceiveMessagesFromSites.cs @@ -7,6 +7,6 @@ namespace NServiceBus.Gateway.Receiving public interface IReceiveMessagesFromSites : IDisposable { event EventHandler MessageReceived; - void Start(Channel channel, int numWorkerThreads); + void Start(Channel channel, int numberOfWorkerThreads); } } \ No newline at end of file diff --git a/src/NServiceBus.Core/Gateway/Receiving/IdempotentChannelReceiver.cs b/src/NServiceBus.Core/Gateway/Receiving/IdempotentChannelReceiver.cs index 1cf0aa519a..23f98498fe 100644 --- a/src/NServiceBus.Core/Gateway/Receiving/IdempotentChannelReceiver.cs +++ b/src/NServiceBus.Core/Gateway/Receiving/IdempotentChannelReceiver.cs @@ -25,12 +25,12 @@ public IdempotentChannelReceiver(IChannelFactory channelFactory, IPersistMessage public IDataBus DataBus { get; set; } public event EventHandler MessageReceived; - public void Start(Channel channel, int numWorkerThreads) + public void Start(Channel channel, int numberOfWorkerThreads) { channelReceiver = channelFactory.GetReceiver(channel.Type); channelReceiver.DataReceived += DataReceivedOnChannel; - channelReceiver.Start(channel.Address, numWorkerThreads); + channelReceiver.Start(channel.Address, numberOfWorkerThreads); } public void Dispose() diff --git a/src/NServiceBus.Core/Gateway/Receiving/SingleCallChannelReceiver.cs b/src/NServiceBus.Core/Gateway/Receiving/SingleCallChannelReceiver.cs index 976dacda5f..75f0534cc4 100644 --- a/src/NServiceBus.Core/Gateway/Receiving/SingleCallChannelReceiver.cs +++ b/src/NServiceBus.Core/Gateway/Receiving/SingleCallChannelReceiver.cs @@ -27,12 +27,12 @@ public class SingleCallChannelReceiver : IReceiveMessagesFromSites public IDataBus DataBus { get; set; } public event EventHandler MessageReceived; - public void Start(Channel channel, int numWorkerThreads) + public void Start(Channel channel, int numberOfWorkerThreads) { channelReceiver = channelFactory.GetReceiver(channel.Type); channelReceiver.DataReceived += DataReceivedOnChannel; receiver.MessageReceived += MessageReceivedOnOldChannel; - channelReceiver.Start(channel.Address, numWorkerThreads); + channelReceiver.Start(channel.Address, numberOfWorkerThreads); } public void Dispose()