Core/Network: Changed AsyncAcceptor to have a start method that returns false if it can't start the network.
Core/Logging: Cleaned up network logging.
This commit is contained in:
@@ -25,13 +25,13 @@ namespace Framework.Networking
|
||||
|
||||
public class AsyncAcceptor
|
||||
{
|
||||
public AsyncAcceptor(string ip, int port)
|
||||
public bool Start(string ip, int port)
|
||||
{
|
||||
var bindIP = IPAddress.None;
|
||||
IPAddress bindIP;
|
||||
if (!IPAddress.TryParse(ip, out bindIP))
|
||||
{
|
||||
Log.outError(LogFilter.Network, "Server can't be started: Invalid IP-Address ({0})", ip);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
try
|
||||
@@ -42,7 +42,10 @@ namespace Framework.Networking
|
||||
catch (SocketException ex)
|
||||
{
|
||||
Log.outException(ex);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public async void AsyncAcceptSocket(SocketAcceptDelegate mgrHandler)
|
||||
|
||||
@@ -27,7 +27,12 @@ namespace Framework.Networking
|
||||
{
|
||||
Contract.Assert(threadCount > 0);
|
||||
|
||||
Acceptor = new AsyncAcceptor(bindIp, port);
|
||||
Acceptor = new AsyncAcceptor();
|
||||
if (!Acceptor.Start(bindIp, port))
|
||||
{
|
||||
Log.outError(LogFilter.Network, "StartNetwork failed to Start AsyncAcceptor");
|
||||
return false;
|
||||
}
|
||||
|
||||
_threadCount = threadCount;
|
||||
_threads = new NetworkThread<TSocketType>[GetNetworkThreadCount()];
|
||||
|
||||
Reference in New Issue
Block a user