Merge remote-tracking branch 'origin/mh/dev' into mh/dev

This commit is contained in:
Marc Hernandez 2024-03-07 17:33:32 -08:00
commit d23ddf6538

View File

@ -31,7 +31,8 @@ static public class log
[Flags] [Flags]
public enum Endpoints public enum Endpoints
{ {
Invalid = 0, None = 0,
File = 1 << 0, File = 1 << 0,
Console = 1 << 1, Console = 1 << 1,
@ -249,6 +250,7 @@ static public class log
} }
} }
static Endpoints s_endpoints = Endpoints.Console;
static void startup( string filename, Endpoints endpoints ) static void startup( string filename, Endpoints endpoints )
{ {
@ -411,11 +413,17 @@ static public class log
//Console.WriteLine( finalMsg ); //Console.WriteLine( finalMsg );
//Console.Out.Write( finalMsg ); //Console.Out.Write( finalMsg );
if( (s_endpoints & Endpoints.File) == Endpoints.File )
{
s_writer.WriteLine( finalLine ); s_writer.WriteLine( finalLine );
}
if( (s_endpoints & Endpoints.Console) == Endpoints.Console )
{
setConsoleColor( evt ); setConsoleColor( evt );
Console.WriteLine( finalLine ); Console.WriteLine( finalLine );
Console.ResetColor(); Console.ResetColor();
}
//Debug.WriteLine( finalLine ); //Debug.WriteLine( finalLine );
@ -423,13 +431,11 @@ static public class log
s_writer.Flush(); s_writer.Flush();
foreach( Log_delegate cb in s_delegates ) foreach( Log_delegate cb in s_delegates )
{
{ {
cb( evt ); cb( evt );
} }
} }
} }
}
catch( Exception ex ) catch( Exception ex )
{ {
Console.WriteLine( "EXCEPTION DURING LOGGING" ); Console.WriteLine( "EXCEPTION DURING LOGGING" );