General/sharplib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x) Pass dbgExp through to the right places

Browse Source 
x) Bunch of logging fixes
This commit is contained in:
Marc Hernandez 2024-05-21 22:26:54 -07:00
parent 914ea91299
commit c9cbacb1c9
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imm/Imm.cs
View File

@ -262,6 +262,7 @@ public record class Recorded<T> : Versioned<T>, imm.Imm
DbgName = dbgName, DbgName = dbgName,
DbgPath = dbgPath, DbgPath = dbgPath,
DbgLine = dbgLine, DbgLine = dbgLine,
DbgExp = dbgExp
} }
}; };
@ -371,6 +372,7 @@ public record class Timed<T> : Recorded<T>, imm.Imm
DbgName = dbgName, DbgName = dbgName,
DbgPath = dbgPath, DbgPath = dbgPath,
DbgLine = dbgLine, DbgLine = dbgLine,
DbgExp = dbgExp,
ZZOld = orig, ZZOld = orig,
//Timed //Timed

27
logging/Log.cs
View File

@ -299,7 +299,7 @@ static public class log
static Endpoints s_endpoints = Endpoints.Console; static Endpoints s_endpoints = Endpoints.Console;
static int s_catWidth = 14; static int s_catWidth = 14;
static int s_timeWidth = 6; static int s_timeWidth = 3;
static void startup( string filename, Endpoints endpoints ) static void startup( string filename, Endpoints endpoints )
{ {
@ -441,7 +441,6 @@ static public class log
} }
} }
static private DateTime s_lastTime = DateTime.MinValue;
static private DateTime s_startTime = DateTime.MinValue; static private DateTime s_startTime = DateTime.MinValue;
static private int s_lastDisplaySeconds = -1; static private int s_lastDisplaySeconds = -1;
@ -451,17 +450,27 @@ static public class log
static public string msgHeader( LogEvent evt ) static public string msgHeader( LogEvent evt )
{ {
var span = evt.Time - s_startTime; if( evt.LogType != LogType.Raw )
{
var span = evt.Time - s_startTime;
char sym = getSymbol( evt.LogType ); char sym = getSymbol( evt.LogType );
var truncatedCat = evt.Cat.Substring( 0, Math.Min( s_catWidth, evt.Cat.Length ) ); var truncatedCat = evt.Cat.Substring( 0, Math.Min( s_catWidth, evt.Cat.Length ) );
var time = span.Milliseconds; // humanTime( secondSpan ); //var time = span.Milliseconds; // humanTime( secondSpan );
var msgHdr = string.Format( $"{s_timeHeader}{{0,-{s_timeWidth}}} | {{1,-{s_catWidth}}}{{2}}| ", time, truncatedCat, sym ); var timeHdr = $"{s_timeHeader}{span.Seconds.ToString("D2")}.{span.Milliseconds.ToString("000")}";
var msgHdr = string.Format( $"{timeHdr} | {{0,-{s_catWidth}}}{{1}}| ", truncatedCat, sym );
return msgHdr;
}
else
{
return "";
}
return msgHdr;
} }
static public string msgFrom( LogEvent evt ) static public string msgFrom( LogEvent evt )
@ -501,7 +510,7 @@ static public class log
{ {
s_lastDisplaySeconds = curSeconds; s_lastDisplaySeconds = curSeconds;
var minuteEvt = new LogEvent( LogType.Raw, $"T I M E ==> {evt.Time.Hour.ToString("D2")}:{evt.Time.Minute.ToString("D2")}:{evt.Time.Second.ToString("D2")}.{evt.Time.Millisecond.ToString("D4")} | {evt.Time.ToShortDateString()}", "", 0, "", "lib.time", null ); var minuteEvt = new LogEvent( LogType.Raw, $"T I M E ==> {evt.Time.Hour.ToString("00")}:{evt.Time.Minute.ToString("00")}:{evt.Time.Second.ToString("00")}.{evt.Time.Millisecond.ToString("000")} : {evt.Time.ToShortDateString()}", "", 0, "", "lib.time", null );
minuteEvt.Time = evt.Time; minuteEvt.Time = evt.Time;
writeSpecialEvent( minuteEvt ); writeSpecialEvent( minuteEvt );
} }