Ellpeck/ExtremelySimpleLogger
1
0
Fork 0
mirror of https://github.com/Ellpeck/ExtremelySimpleLogger.git synced 2024-11-22 01:53:29 +01:00
Code Issues Projects Releases Wiki Activity

rethrow file and directory think exceptions with proper information

Browse source
This commit is contained in:
Ell 2021-11-04 18:06:55 +01:00
parent 7a5929f8e8
commit 46bb08f60b
2 changed files with 52 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ExtremelySimpleLogger/DirectorySink.cs
View file

@ -36,24 +36,32 @@ namespace ExtremelySimpleLogger {
public DirectorySink(DirectoryInfo directory, int maxFiles = 10, bool reopenOnWrite = false, string dateFormat = DefaultDateFormat) { public DirectorySink(DirectoryInfo directory, int maxFiles = 10, bool reopenOnWrite = false, string dateFormat = DefaultDateFormat) {
this.reopenOnWrite = reopenOnWrite; this.reopenOnWrite = reopenOnWrite;
if (!directory.Exists) try {
directory.Create(); if (!directory.Exists)
directory.Create();
} catch (Exception e) {
throw new IOException($"Failed to create directory sink directory {directory}", e);
}
// delete old files try {
var files = directory.GetFiles(); // delete old files
if (files.Length >= maxFiles) { var files = directory.GetFiles();
// order files by their creation time so that older files are deleted first if (files.Length >= maxFiles) {
var ordered = files.OrderBy(f => f.CreationTime).ToList(); // order files by their creation time so that older files are deleted first
while (ordered.Count >= maxFiles) { var ordered = files.OrderBy(f => f.CreationTime).ToList();
ordered[0].Delete(); while (ordered.Count >= maxFiles) {
ordered.RemoveAt(0); ordered[0].Delete();
ordered.RemoveAt(0);
}
} }
} catch (Exception e) {
throw new IOException($"Failed to delete old files in directory sink {directory}", e);
} }
var date = DateTime.Now.ToString(dateFormat); var date = DateTime.Now.ToString(dateFormat);
this.file = new FileInfo(Path.Combine(directory.FullName, $"{date}.txt")); this.file = new FileInfo(Path.Combine(directory.FullName, $"{date}.txt"));
if (!reopenOnWrite) { if (!reopenOnWrite) {
this.writer = this.file.AppendText(); this.writer = this.Append();
this.writer.AutoFlush = true; this.writer.AutoFlush = true;
} }
} }
@ -67,7 +75,7 @@ namespace ExtremelySimpleLogger {
protected override void Log(Logger logger, LogLevel level, string s) { protected override void Log(Logger logger, LogLevel level, string s) {
lock (this.file) { lock (this.file) {
if (this.reopenOnWrite) { if (this.reopenOnWrite) {
using (var w = this.file.AppendText()) using (var w = this.Append())
w.WriteLine(s); w.WriteLine(s);
} else { } else {
this.writer.WriteLine(s); this.writer.WriteLine(s);
@ -86,5 +94,13 @@ namespace ExtremelySimpleLogger {
} }
} }
private StreamWriter Append() {
try {
return this.file.AppendText();
} catch (Exception e) {
throw new IOException($"Failed to append to directory sink file {this.file}", e);
}
}
} }
} }

31
ExtremelySimpleLogger/FileSink.cs
View file

@ -1,3 +1,4 @@
using System;
using System.IO; using System.IO;
namespace ExtremelySimpleLogger { namespace ExtremelySimpleLogger {
@ -33,15 +34,23 @@ namespace ExtremelySimpleLogger {
this.reopenOnWrite = reopenOnWrite; this.reopenOnWrite = reopenOnWrite;
this.file = file; this.file = file;
var dir = file.Directory; try {
if (dir != null && !dir.Exists) var dir = file.Directory;
dir.Create(); if (dir != null && !dir.Exists)
dir.Create();
} catch (Exception e) {
throw new IOException($"Failed to create directory for file sink {file}", e);
}
if (file.Exists && (!append || file.Length >= fileSizeLimit)) try {
file.Delete(); if (file.Exists && (!append || file.Length >= fileSizeLimit))
file.Delete();
} catch (Exception e) {
throw new IOException($"Failed to delete file sink file {file}", e);
}
if (!reopenOnWrite) { if (!reopenOnWrite) {
this.writer = file.AppendText(); this.writer = this.Append();
this.writer.AutoFlush = true; this.writer.AutoFlush = true;
} }
} }
@ -55,7 +64,7 @@ namespace ExtremelySimpleLogger {
protected override void Log(Logger logger, LogLevel level, string s) { protected override void Log(Logger logger, LogLevel level, string s) {
lock (this.file) { lock (this.file) {
if (this.reopenOnWrite) { if (this.reopenOnWrite) {
using (var w = this.file.AppendText()) using (var w = this.Append())
w.WriteLine(s); w.WriteLine(s);
} else { } else {
this.writer.WriteLine(s); this.writer.WriteLine(s);
@ -74,5 +83,13 @@ namespace ExtremelySimpleLogger {
} }
} }
private StreamWriter Append() {
try {
return this.file.AppendText();
} catch (Exception e) {
throw new IOException($"Failed to append to file sink {this.file}", e);
}
}
} }
} }