tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace custom FileLogger with Serilog

Browse Source
This commit is contained in:
Robert McRackan 2019-12-04 09:58:31 -05:00
parent f8a51f0882
commit b120bb8a66
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibationWinForm/UNTESTED/BookLiberation/DecryptForm.cs
View File

@ -8,12 +8,6 @@ namespace LibationWinForm.BookLiberation
{ {
public partial class DecryptForm : Form public partial class DecryptForm : Form
{ {
class SerilogTextWriter : System.IO.TextWriter
{
public override System.Text.Encoding Encoding => System.Text.Encoding.ASCII;
public override void WriteLine(string value) => Serilog.Log.Logger.Debug(value);
}
public DecryptForm() public DecryptForm()
{ {
InitializeComponent(); InitializeComponent();
@ -23,8 +17,10 @@ namespace LibationWinForm.BookLiberation
private void DecryptForm_Load(object sender, EventArgs e) private void DecryptForm_Load(object sender, EventArgs e)
{ {
// redirect Console.WriteLine to console, textbox // redirect Console.WriteLine to console, textbox
var controlWriter = new RichTextBoxTextWriter(this.rtbLog); var multiLogger = new MultiTextWriter(
var multiLogger = new MultiTextWriter(origOut, controlWriter, new SerilogTextWriter()); origOut,
new RichTextBoxTextWriter(this.rtbLog),
new SerilogTextWriter());
Console.SetOut(multiLogger); Console.SetOut(multiLogger);
} }

44
_Demos/inAudibleLite/Form1.cs
View File

@ -5,7 +5,9 @@ using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using AaxDecrypter; using AaxDecrypter;
using Dinah.Core.IO; using Dinah.Core.IO;
using Dinah.Core.Logging;
using Dinah.Core.Windows.Forms; using Dinah.Core.Windows.Forms;
using Serilog;
namespace inAudibleLite namespace inAudibleLite
{ {
@ -23,18 +25,44 @@ namespace inAudibleLite
InitializeComponent(); InitializeComponent();
this.btnConvert.Enabled = false; this.btnConvert.Enabled = false;
initLogging(); initSerilog();
redirectWriteLine();
} }
private void initLogging() private static void initSerilog()
{
// default. for reference. output example:
// 2019-11-26 08:48:40.224 -05:00 [DBG] Begin Libation
var default_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}";
// with class and method info. output example:
// 2019-11-26 08:48:40.224 -05:00 [DBG] (at LibationWinForm.Program.init()) Begin Libation
var code_outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] (at {Caller}) {Message:lj}{NewLine}{Exception}";
var logPath = Path.Combine(Path.GetTempPath(), "Log.log");
Log.Logger = new LoggerConfiguration()
.Enrich.WithCaller()
.MinimumLevel.Debug()
.WriteTo.File(logPath,
rollingInterval: RollingInterval.Month,
outputTemplate: code_outputTemplate)
.CreateLogger();
Log.Logger.Debug("Begin Libation");
// .Here() captures debug info via System.Runtime.CompilerServices attributes. Warning: expensive
//var withLineNumbers_outputTemplate = "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}in method {MemberName} at {FilePath}:{LineNumber}{NewLine}{Exception}{NewLine}";
//Log.Logger.Here().Debug("Begin Libation. Debug with line numbers");
}
private void redirectWriteLine()
{ {
// redirect Console.WriteLine to console, log file, textbox // redirect Console.WriteLine to console, log file, textbox
var origOut = Console.Out; var multiLogger = new MultiTextWriter(
var controlWriter = new RichTextBoxTextWriter(this.rtbLog); Console.Out,
var tempPath = Path.GetTempPath(); new RichTextBoxTextWriter(this.rtbLog),
var logger1 = new FileLogger(Path.Combine(tempPath, APP_NAME)); new SerilogTextWriter());
var logger2 = new FileLoggerTextWriter(logger1);
var multiLogger = new MultiTextWriter(origOut, controlWriter, logger2);
Console.SetOut(multiLogger); Console.SetOut(multiLogger);
} }