shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix error handler bug with false errors

Browse source 
It was throwing false 'request not found in protocol' errors!
This commit is contained in:
Michael VanOverbeek 2017-02-16 15:28:08 +00:00
parent 5a89c2ad6b
commit 781351aefb
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ShiftOS.Server/Program.cs
View file

@ -231,12 +231,12 @@ namespace ShiftOS.Server
{
foreach (var attrib in method.GetCustomAttributes(false))
{
new Thread(() =>
if (attrib is MudRequestAttribute)
{
if (attrib is MudRequestAttribute)
var mAttrib = attrib as MudRequestAttribute;
if (mAttrib.RequestName == msg.Name)
{
var mAttrib = attrib as MudRequestAttribute;
if (mAttrib.RequestName == msg.Name)
new Thread(() =>
{
try
{
@ -244,7 +244,7 @@ namespace ShiftOS.Server
bool throwOnNull = false;
if(mAttrib.ExpectedType == typeof(int))
if (mAttrib.ExpectedType == typeof(int))
{
int result = 0;
if (int.TryParse(msg.Contents, out result) == true)
@ -256,7 +256,7 @@ namespace ShiftOS.Server
throw new MudException($"Protocol error: {msg.Name} expects a 32-bit signed integer for the message contents.");
}
}
else if(mAttrib.ExpectedType == typeof(long))
else if (mAttrib.ExpectedType == typeof(long))
{
long result = 0;
if (long.TryParse(msg.Contents, out result) == true)
@ -268,10 +268,10 @@ namespace ShiftOS.Server
throw new MudException($"Protocol error: {msg.Name} expects a 64-bit signed integer for the message contents.");
}
}
else if(mAttrib.ExpectedType == typeof(bool))
else if (mAttrib.ExpectedType == typeof(bool))
{
throwOnNull = true;
if(msg.Contents.ToLower() == "true")
if (msg.Contents.ToLower() == "true")
{
contents = true;
}
@ -285,7 +285,7 @@ namespace ShiftOS.Server
throw new MudException("Protocol error: " + msg.Name + " expects a content type of 'boolean'. Please send either 'true' or 'false'.");
}
}
else if(mAttrib.ExpectedType == null)
else if (mAttrib.ExpectedType == null)
{
throwOnNull = false;
}
@ -314,14 +314,11 @@ namespace ShiftOS.Server
Console.WriteLine(mEx);
ClientDispatcher.DispatchTo("Error", msg.GUID, mEx);
}
catch
{
Console.WriteLine($@"[{DateTime.Now}] {method.Name}: Missing guid and content parameters, request handler NOT RAN.");
}
return;
}
}).Start();
return;
}
}).Start();
}
}
}
}