Skip to content

Commit

Permalink
fix some spelling errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@SimonCropp
SimonCropp committed Aug 19, 2013
1 parent 41a3b8c commit d41c13e
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 48 deletions.
81 changes: 39 additions & 42 deletions src/NServiceBus.Core/Gateway/Channels/Http/HttpChannelReceiver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,23 @@ public class HttpChannelReceiver : IChannelReceiver
{
public event EventHandler<DataReceivedOnChannelArgs> 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
{
listener.Start();
}
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;
Expand All @@ -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<IHttpResponder>().Handle(ctx);
Configure.Instance.Builder.Build<IHttpResponder>().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;
Expand All @@ -114,18 +112,18 @@ bool IsGatewayRequest(HttpListenerRequest request)
}


static IDictionary<string, string> GetHeaders(HttpListenerContext ctx)
static IDictionary<string, string> GetHeaders(HttpListenerContext context)
{
var headers = new Dictionary<string, string>(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;
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Gateway/Channels/IChannelReceiver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public interface IChannelReceiver : IDisposable
{
event EventHandler<DataReceivedOnChannelArgs> DataReceived;

void Start(string address, int numWorkerThreads);
void Start(string address, int numberOfWorkerThreads);
}

public class DataReceivedOnChannelArgs : EventArgs
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Gateway/Receiving/IReceiveMessagesFromSites.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ namespace NServiceBus.Gateway.Receiving
public interface IReceiveMessagesFromSites : IDisposable
{
event EventHandler<MessageReceivedOnChannelArgs> MessageReceived;
void Start(Channel channel, int numWorkerThreads);
void Start(Channel channel, int numberOfWorkerThreads);
}
}
4 changes: 2 additions & 2 deletions src/NServiceBus.Core/Gateway/Receiving/IdempotentChannelReceiver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ public IdempotentChannelReceiver(IChannelFactory channelFactory, IPersistMessage
public IDataBus DataBus { get; set; }
public event EventHandler<MessageReceivedOnChannelArgs> 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()
Expand Down
4 changes: 2 additions & 2 deletions src/NServiceBus.Core/Gateway/Receiving/SingleCallChannelReceiver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ public class SingleCallChannelReceiver : IReceiveMessagesFromSites
public IDataBus DataBus { get; set; }
public event EventHandler<MessageReceivedOnChannelArgs> 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()
Expand Down

0 comments on commit d41c13e

Please sign in to comment.