Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ZLogger/AsyncStreamLineMessageWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public AsyncStreamLineMessageWriter(Stream stream, ZLoggerOptions options)
}),
_ => throw new ArgumentOutOfRangeException()
};

this.writeLoop = Task.Run(WriteLoop);
}

Expand Down Expand Up @@ -103,7 +103,7 @@ void AppendLine(StreamBufferWriter writer)
{
var span = writer.GetSpan(newLine.Length);
newLine.CopyTo(span);
writer.Advance(2);
writer.Advance(newLine.Length);
}
}

Expand Down
24 changes: 15 additions & 9 deletions src/ZLogger/Internal/StreamBufferWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,23 @@ public void Flush()
{
if (written != 0)
{
// sync writer, ConsolePal does not support async write, use Write(byte[]) API is most primitive.
stream.Write(buffer, 0, written);
stream.Flush();
written = 0;

if (buffer != defaultBuffer)
try
{
// sync writer, ConsolePal does not support async write, use Write(byte[]) API is most primitive.
stream.Write(buffer, 0, written);
stream.Flush();
}
finally
{
ArrayPool<byte>.Shared.Return(buffer);
buffer = defaultBuffer;
written = 0;

if (buffer != defaultBuffer)
{
ArrayPool<byte>.Shared.Return(buffer);
buffer = defaultBuffer;
}
}
}
}
}
}
}