-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
chore: update tokio in tls #3188
Conversation
I'm not sure that we need these cyclical dependencies in features: sources-http = ["warp", "sources-tls"]
sources-logplex = ["warp", "sources-tls"]
sources-socket = ["bytesize", "listenfd", "tokio/uds", "tokio-util/udp", "sources-tls"]
sources-splunk_hec = ["bytesize", "warp", "sources-tls"]
sources-tls = ["sources-http", "sources-logplex", "sources-socket", "sources-splunk_hec"] I think that Addressed in #3210 |
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I love how much this simplifies the TLS wrappers. Some questions about some of the patches though.
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
TcpSink do not work properly now on shutdown :( need learn how compat works for fixing code =\ |
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost there! I'll try to be faster on the review next time, sorry.
.incoming() | ||
.take(2) | ||
.for_each(|connection| { | ||
let mut close_rx = close_rx.take(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did this need to become an option?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tokio::sync::oneshot::Receiver not Copy
and not Clone
and can be used only once, but we have two connections, so I need say for a second that I do not have Receiver
to it.
src/sinks/util/tcp.rs
Outdated
// enum TcpSinkState2 { | ||
// Disconnected, | ||
// ResolvingDns(BoxFuture<'static, Result<crate::dns::LookupIp, crate::dns::DnsError>>), | ||
// Connecting(BoxFuture<'static, Result<MaybeTlsStream<TcpStream>, TlsError>>), | ||
// Connected(FramedWrite<MaybeTlsStream<TcpStream>, BytesCodec>), | ||
// Backoff(BoxFuture<'static, ()>), | ||
// } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should clean up all the commented out code before merging.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I understand that this code not related anyhow with current TcpSink, but can be very useful in future for saving time of anybody who will work on migrating to new Sink trait. If you insist to delete this, can I at least add a link to relevant code in this PR with a comment about new Sink trait impl?
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
This reverts commit 9b05bdc.
This reverts commit 9b05bdc. Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
* chore: update tokio in tls Signed-off-by: Kirill Fomichev <fanatid@ya.ru>
* chore: update tokio in tls Signed-off-by: Kirill Fomichev <fanatid@ya.ru> Signed-off-by: Brian Menges <brian.menges@anaplan.com>
) This reverts commit 9b05bdc. Signed-off-by: Kirill Fomichev <fanatid@ya.ru> Signed-off-by: Brian Menges <brian.menges@anaplan.com>
Ref. #2945
Tokio update in
src/tls
. Still need figure out lifetime problem for warp, see seanmonstar/warp#675 (currently works with patchedwarp
: https://github.com/timberio/warp/tree/serve-incoming-lifetime)