github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace threads with tasks

pull/595/head
NextTurn 2020-02-24 00:00:00 +08:00 committed by Next Turn
parent b419e9c8e2
commit db842409f1
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/WinSW.Core/LogAppenders.cs
View File

@ -2,7 +2,6 @@
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Threading;
using WinSW.Util; using WinSW.Util;
namespace WinSW namespace WinSW
@ -31,10 +30,10 @@ namespace WinSW
/// <summary> /// <summary>
/// Convenience method to copy stuff from StreamReader to StreamWriter /// Convenience method to copy stuff from StreamReader to StreamWriter
/// </summary> /// </summary>
protected void CopyStream(StreamReader reader, StreamWriter writer) protected async void CopyStreamAsync(StreamReader reader, StreamWriter writer)
{ {
string? line; string? line;
while ((line = reader.ReadLine()) != null) while ((line = await reader.ReadLineAsync()) != null)
{ {
writer.WriteLine(line); writer.WriteLine(line);
} }
@ -129,12 +128,12 @@ namespace WinSW
protected override void LogOutput(StreamReader outputReader) protected override void LogOutput(StreamReader outputReader)
{ {
new Thread(() => this.CopyStream(outputReader, this.CreateWriter(new FileStream(this.OutputLogFileName, this.FileMode)))).Start(); this.CopyStreamAsync(outputReader, this.CreateWriter(new FileStream(this.OutputLogFileName, this.FileMode)));
} }
protected override void LogError(StreamReader errorReader) protected override void LogError(StreamReader errorReader)
{ {
new Thread(() => this.CopyStream(errorReader, this.CreateWriter(new FileStream(this.ErrorLogFileName, this.FileMode)))).Start(); this.CopyStreamAsync(errorReader, this.CreateWriter(new FileStream(this.ErrorLogFileName, this.FileMode)));
} }
} }
@ -181,25 +180,25 @@ namespace WinSW
protected override void LogOutput(StreamReader outputReader) protected override void LogOutput(StreamReader outputReader)
{ {
new Thread(() => this.CopyStreamWithDateRotation(outputReader, this.OutFilePattern)).Start(); this.CopyStreamWithDateRotationAsync(outputReader, this.OutFilePattern);
} }
protected override void LogError(StreamReader errorReader) protected override void LogError(StreamReader errorReader)
{ {
new Thread(() => this.CopyStreamWithDateRotation(errorReader, this.ErrFilePattern)).Start(); this.CopyStreamWithDateRotationAsync(errorReader, this.ErrFilePattern);
} }
/// <summary> /// <summary>
/// Works like the CopyStream method but does a log rotation based on time. /// Works like the CopyStream method but does a log rotation based on time.
/// </summary> /// </summary>
private void CopyStreamWithDateRotation(StreamReader reader, string ext) private async void CopyStreamWithDateRotationAsync(StreamReader reader, string ext)
{ {
PeriodicRollingCalendar periodicRollingCalendar = new PeriodicRollingCalendar(this.Pattern, this.Period); PeriodicRollingCalendar periodicRollingCalendar = new PeriodicRollingCalendar(this.Pattern, this.Period);
periodicRollingCalendar.Init(); periodicRollingCalendar.Init();
StreamWriter writer = this.CreateWriter(new FileStream(this.BaseLogFileName + "_" + periodicRollingCalendar.Format + ext, FileMode.Append)); StreamWriter writer = this.CreateWriter(new FileStream(this.BaseLogFileName + "_" + periodicRollingCalendar.Format + ext, FileMode.Append));
string? line; string? line;
while ((line = reader.ReadLine()) != null) while ((line = await reader.ReadLineAsync()) != null)
{ {
if (periodicRollingCalendar.ShouldRoll) if (periodicRollingCalendar.ShouldRoll)
{ {
@ -240,24 +239,24 @@ namespace WinSW
protected override void LogOutput(StreamReader outputReader) protected override void LogOutput(StreamReader outputReader)
{ {
new Thread(() => this.CopyStreamWithRotation(outputReader, this.OutFilePattern)).Start(); this.CopyStreamWithRotationAsync(outputReader, this.OutFilePattern);
} }
protected override void LogError(StreamReader errorReader) protected override void LogError(StreamReader errorReader)
{ {
new Thread(() => this.CopyStreamWithRotation(errorReader, this.ErrFilePattern)).Start(); this.CopyStreamWithRotationAsync(errorReader, this.ErrFilePattern);
} }
/// <summary> /// <summary>
/// Works like the CopyStream method but does a log rotation. /// Works like the CopyStream method but does a log rotation.
/// </summary> /// </summary>
private void CopyStreamWithRotation(StreamReader reader, string ext) private async void CopyStreamWithRotationAsync(StreamReader reader, string ext)
{ {
StreamWriter writer = this.CreateWriter(new FileStream(this.BaseLogFileName + ext, FileMode.Append)); StreamWriter writer = this.CreateWriter(new FileStream(this.BaseLogFileName + ext, FileMode.Append));
long fileLength = new FileInfo(this.BaseLogFileName + ext).Length; long fileLength = new FileInfo(this.BaseLogFileName + ext).Length;
string? line; string? line;
while ((line = reader.ReadLine()) != null) while ((line = await reader.ReadLineAsync()) != null)
{ {
int lengthToWrite = (line.Length + Environment.NewLine.Length) * sizeof(char); int lengthToWrite = (line.Length + Environment.NewLine.Length) * sizeof(char);
if (fileLength + lengthToWrite > this.SizeThreshold) if (fileLength + lengthToWrite > this.SizeThreshold)
@ -366,15 +365,15 @@ namespace WinSW
protected override void LogOutput(StreamReader outputReader) protected override void LogOutput(StreamReader outputReader)
{ {
new Thread(() => this.CopyStreamWithRotation(outputReader, this.OutFilePattern)).Start(); this.CopyStreamWithRotationAsync(outputReader, this.OutFilePattern);
} }
protected override void LogError(StreamReader errorReader) protected override void LogError(StreamReader errorReader)
{ {
new Thread(() => this.CopyStreamWithRotation(errorReader, this.ErrFilePattern)).Start(); this.CopyStreamWithRotationAsync(errorReader, this.ErrFilePattern);
} }
private void CopyStreamWithRotation(StreamReader reader, string extension) private async void CopyStreamWithRotationAsync(StreamReader reader, string extension)
{ {
// lock required as the timer thread and the thread that will write to the stream could try and access the file stream at the same time // lock required as the timer thread and the thread that will write to the stream could try and access the file stream at the same time
var fileLock = new object(); var fileLock = new object();
@ -392,7 +391,7 @@ namespace WinSW
// Run at start // Run at start
var tickTime = this.SetupRollTimer(autoRollAtTime); var tickTime = this.SetupRollTimer(autoRollAtTime);
var timer = new System.Timers.Timer(tickTime); var timer = new System.Timers.Timer(tickTime);
timer.Elapsed += (s, e) => timer.Elapsed += (_, _) =>
{ {
try try
{ {
@ -428,7 +427,7 @@ namespace WinSW
} }
string? line; string? line;
while ((line = reader.ReadLine()) != null) while ((line = await reader.ReadLineAsync()) != null)
{ {
lock (fileLock) lock (fileLock)
{ {