Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added MultiplexedStreamReader #473

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added MultiplexedStreamReader #473

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e37f67
Added MultiplexedStreamReader
Oct 15, 2020
7ef1e8b
Added default for cancellation token in read line
Oct 15, 2020
da4a4f0
support cancellation
ACoderLife Sep 19, 2022
041c994
Merge branch 'dotnet:master' into log_reader
ACoderLife Sep 19, 2022
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
44 changes: 44 additions & 0 deletions src/Docker.DotNet/MultiplexedStreamReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using System.Collections.Generic;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace Docker.DotNet
{
public class MultiplexedStreamReader
{
private readonly MultiplexedStream _stream;

public MultiplexedStreamReader(MultiplexedStream stream)
{
_stream = stream;
}

public async Task<string> ReadLineAsync(CancellationToken token = default)
{
var line = new List<byte>();

var buffer = new byte[1];

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@The-TT-Hacker I tested this method trying to get rid of headers being shown on MonitorStreamAsync method and haven't managed to cancel it.
Would you confirm if expected behaviour is to read until 0 bytes are returned or to stop reading when no more lines are retrieved?
When res equals 0, it loops indefinitelly.
This is test I used
https://gist.github.com/dgvives/2620960049191797ea0d871c339d9bc2#file-program-cs-L1

It would be nice if MultiplexedStreamReader could detect stream being multiplexed and provide output por ReadLineAsync without control chars.

Have you checked this running containers on different platforms? Because of EOL

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ACoderLife hey! Sorry for taking long. I'm cleaning up and merging so PRs with fixes and improvements before I start the wave of changes on the whole codebase.

That being said, have you checked @dgvives concern with the infinite loop?

Thank you!

while (true)
{
var res = await _stream.ReadOutputAsync(buffer, 0, 1, token);

if (res.Count == 0)
{
continue;
}

else if (buffer[0] == '\n')
{
return Encoding.UTF8.GetString(line.ToArray());
}

else
{
line.Add(buffer[0]);
}
}
}
}
}