charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(SWT): Improved logging

Browse Source
This commit is contained in:
MrGadget 2024-09-20 10:59:55 -04:00
parent d8ad113212
commit 6fad347bc0
6 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/WebSocketClientStandAlone.cs
View File

@ -101,7 +101,7 @@ void ConnectAndReceiveLoop(Uri serverAddress)
ReceiveLoop.Loop(config); ReceiveLoop.Loop(config);
} }
catch (ThreadInterruptedException e) { Log.InfoException(e); } catch (ThreadInterruptedException e) { Log.InfoException(e); }
catch (ThreadAbortException e) { Log.InfoException(e); } catch (ThreadAbortException e) { Log.Error("[SWT-WebSocketClientStandAlone]: Thread Abort Exception"); }
catch (Exception e) { Log.Exception(e); } catch (Exception e) { Log.Exception(e); }
finally finally
{ {

16
Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/Log.cs
View File

@ -138,13 +138,13 @@ public static void Verbose(string msg)
public static void Verbose<T>(string msg, T arg1) public static void Verbose<T>(string msg, T arg1)
{ {
if (minLogLevel > Levels.Verbose) return; if (minLogLevel > Levels.Verbose) return;
Verbose($"{msg} {arg1}"); Verbose(String.Format(msg, arg1));
} }
public static void Verbose<T1, T2>(string msg, T1 arg1, T2 arg2) public static void Verbose<T1, T2>(string msg, T1 arg1, T2 arg2)
{ {
if (minLogLevel > Levels.Verbose) return; if (minLogLevel > Levels.Verbose) return;
Verbose($"{msg} {arg1} {arg2}"); Verbose(String.Format(msg, arg1, arg2));
} }
/// <summary> /// <summary>
@ -168,13 +168,13 @@ static void Info(string msg, ConsoleColor consoleColor = ConsoleColor.Cyan)
public static void Info<T>(string msg, T arg1, ConsoleColor consoleColor = ConsoleColor.Cyan) public static void Info<T>(string msg, T arg1, ConsoleColor consoleColor = ConsoleColor.Cyan)
{ {
if (minLogLevel > Levels.Info) return; if (minLogLevel > Levels.Info) return;
Info($"{msg} {arg1}", consoleColor); Info(String.Format(msg, arg1), consoleColor);
} }
public static void Info<T1, T2>(string msg, T1 arg1, T2 arg2, ConsoleColor consoleColor = ConsoleColor.Cyan) public static void Info<T1, T2>(string msg, T1 arg1, T2 arg2, ConsoleColor consoleColor = ConsoleColor.Cyan)
{ {
if (minLogLevel > Levels.Info) return; if (minLogLevel > Levels.Info) return;
Info($"{msg} {arg1} {arg2}", consoleColor); Info(String.Format(msg, arg1, arg2), consoleColor);
} }
/// <summary> /// <summary>
@ -218,7 +218,7 @@ public static void Warn(string msg)
public static void Warn<T>(string msg, T arg1) public static void Warn<T>(string msg, T arg1)
{ {
if (minLogLevel > Levels.Warn) return; if (minLogLevel > Levels.Warn) return;
Warn($"{msg} {arg1}"); Warn(String.Format(msg, arg1));
} }
/// <summary> /// <summary>
@ -243,19 +243,19 @@ public static void Error(string msg)
public static void Error<T>(string msg, T arg1) public static void Error<T>(string msg, T arg1)
{ {
if (minLogLevel > Levels.Error) return; if (minLogLevel > Levels.Error) return;
Error($"{msg} {arg1}"); Error(String.Format(msg, arg1));
} }
public static void Error<T1, T2>(string msg, T1 arg1, T2 arg2) public static void Error<T1, T2>(string msg, T1 arg1, T2 arg2)
{ {
if (minLogLevel > Levels.Error) return; if (minLogLevel > Levels.Error) return;
Error($"{msg} {arg1} {arg2}"); Error(String.Format(msg, arg1, arg2));
} }
public static void Error<T1, T2, T3>(string msg, T1 arg1, T2 arg2, T3 arg3) public static void Error<T1, T2, T3>(string msg, T1 arg1, T2 arg2, T3 arg3)
{ {
if (minLogLevel > Levels.Error) return; if (minLogLevel > Levels.Error) return;
Error($"{msg} {arg1} {arg2} {arg3}"); Error(String.Format(msg, arg1, arg2, arg3));
} }
/// <summary> /// <summary>

4
Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReadHelper.cs
View File

@ -20,7 +20,7 @@ public static int Read(Stream stream, byte[] outBuffer, int outOffset, int lengt
{ {
int read = stream.Read(outBuffer, outOffset + received, length - received); int read = stream.Read(outBuffer, outOffset + received, length - received);
if (read == 0) if (read == 0)
throw new ReadHelperException("returned 0"); throw new ReadHelperException("[SWT-ReadHelper]: Read returned 0");
received += read; received += read;
} }
@ -35,7 +35,7 @@ public static int Read(Stream stream, byte[] outBuffer, int outOffset, int lengt
} }
if (received != length) if (received != length)
throw new ReadHelperException("returned not equal to length"); throw new ReadHelperException("[SWT-ReadHelper]: received not equal to length");
return outOffset + received; return outOffset + received;
} }

7
Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/ReceiveLoop.cs
View File

@ -72,12 +72,9 @@ public static void Loop(Config config)
} }
} }
catch (ThreadInterruptedException e) { Log.InfoException(e); } catch (ThreadInterruptedException e) { Log.InfoException(e); }
catch (ThreadAbortException e) { Log.InfoException(e); } catch (ThreadAbortException e) { Log.Error("[SWT-ReceiveLoop]: Thread Abort Exception"); }
catch (ObjectDisposedException e) { Log.InfoException(e); } catch (ObjectDisposedException e) { Log.InfoException(e); }
catch (ReadHelperException e) catch (ReadHelperException e) { Log.InfoException(e); }
{
Log.InfoException(e);
}
catch (SocketException e) catch (SocketException e)
{ {
// this could happen if wss client closes stream // this could happen if wss client closes stream

7
Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Common/SendLoop.cs
View File

@ -116,11 +116,8 @@ public static void Loop(Config config)
Log.Verbose("[SWT-SendLoop]: {0} Not Connected", conn); Log.Verbose("[SWT-SendLoop]: {0} Not Connected", conn);
} }
catch (ThreadInterruptedException e) { Log.InfoException(e); } catch (ThreadInterruptedException e) { Log.InfoException(e); }
catch (ThreadAbortException e) { Log.InfoException(e); } catch (ThreadAbortException e) { Log.Error("[SWT-SendLoop]: Thread Abort Exception"); }
catch (Exception e) catch (Exception e) { Log.Exception(e); }
{
Log.Exception(e);
}
finally finally
{ {
Profiler.EndThreadProfiling(); Profiler.EndThreadProfiling();

17
Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Server/WebSocketServer.cs
View File

@ -97,7 +97,7 @@ void acceptLoop()
} }
} }
catch (ThreadInterruptedException e) { Log.InfoException(e); } catch (ThreadInterruptedException e) { Log.InfoException(e); }
catch (ThreadAbortException e) { Log.InfoException(e); } catch (ThreadAbortException e) { Log.Error("[SWT-WebSocketServer]: Thread Abort Exception"); }
catch (Exception e) { Log.Exception(e); } catch (Exception e) { Log.Exception(e); }
} }
@ -160,18 +160,9 @@ void HandshakeAndReceiveLoop(Connection conn)
ReceiveLoop.Loop(receiveConfig); ReceiveLoop.Loop(receiveConfig);
} }
catch (ThreadInterruptedException e) catch (ThreadInterruptedException e) { Log.InfoException(e); }
{ catch (ThreadAbortException e) { Log.Error("[SWT-WebSocketServer]: Thread Abort Exception"); }
Log.Error("[SWT-WebSocketServer]: Handshake ThreadInterruptedException {0}", e.Message); catch (Exception e) { Log.Exception(e); }
}
catch (ThreadAbortException e)
{
Log.Error("[SWT-WebSocketServer]: Handshake ThreadAbortException {0}", e.Message);
}
catch (Exception e)
{
Log.Error("[SWT-WebSocketServer]: Handshake Exception {0}", e.Message);
}
finally finally
{ {
// close here in case connect fails // close here in case connect fails