mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-03 04:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not check readiness for dispatcher call

Browse source
This commit is contained in:
Nikolay Kim 2024-10-10 18:57:24 +05:00
parent c670b51983
commit d101fbc668
5 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ntex-io/CHANGES.md
View file

@ -1,10 +1,16 @@
# Changes
## [2.6.1] - 2024-10-17
## [2.7.0] - 2024-10-10
* Do not check readiness for dispatcher call
* Handle service readiness errors during shutdown in dispatcher
## [2.6.1] - 2024-10-07
* Return error for Io::poll_read_ready() if io is closed.
## [2.6.0] - 2024-10-17
## [2.6.0] - 2024-10-07
* Return error for IoRef::write(), IoRef::with_write_buf(), Io::poll_flush() if io is closed.

6
ntex-io/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-io"
version = "2.6.1"
version = "2.7.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Utilities for encoding and decoding frames"
keywords = ["network", "framework", "async", "futures"]
@ -16,8 +16,8 @@ name = "ntex_io"
path = "src/lib.rs"
[dependencies]
ntex-codec = "0.6.2"
ntex-bytes = "0.1.24"
ntex-codec = "0.6"
ntex-bytes = "0.1"
ntex-util = "2.3"
ntex-service = "3"

23
ntex-io/src/dispatcher.rs
View file

@ -366,7 +366,11 @@ where
// service may relay on poll_ready for response results
if !slf.flags.contains(Flags::READY_ERR) {
let _ = slf.shared.service.poll_ready(cx);
if let Poll::Ready(res) = slf.shared.service.poll_ready(cx) {
if res.is_err() {
slf.flags.insert(Flags::READY_ERR);
}
}
}
if slf.shared.inflight.get() == 0 {
@ -422,7 +426,7 @@ where
U: Decoder + Encoder + 'static,
{
fn call_service(&mut self, cx: &mut Context<'_>, item: DispatchItem<U>) {
let mut fut = self.shared.service.call(item);
let mut fut = self.shared.service.call_nowait(item);
self.shared.inflight.set(self.shared.inflight.get() + 1);
// optimize first call
@ -434,7 +438,7 @@ where
}
} else {
let shared = self.shared.clone();
let _ = spawn(async move {
spawn(async move {
let result = fut.await;
shared.handle_result(result, &shared.io, true);
});
@ -468,7 +472,7 @@ where
// pause io read task
Poll::Pending => {
log::trace!(
"{}: Service is not ready, register dispatch task",
"{}: Service is not ready, register dispatcher",
self.shared.io.tag()
);
@ -610,8 +614,8 @@ mod tests {
use ntex_bytes::{Bytes, BytesMut, PoolId, PoolRef};
use ntex_codec::BytesCodec;
use ntex_service::ServiceCtx;
use ntex_util::{time::sleep, time::Millis};
use ntex_service::{chain, fn_service, ServiceCtx};
use ntex_util::{channel::condition, time::sleep, time::Millis};
use rand::Rng;
use super::*;
@ -862,13 +866,14 @@ mod tests {
}
let (disp, state) = Dispatcher::debug(server, BytesCodec, Srv(counter.clone()));
spawn(async move {
let _ = disp.await;
});
state
.io()
.encode(Bytes::from_static(b"GET /test HTTP/1\r\n\r\n"), &BytesCodec)
.unwrap();
spawn(async move {
let _ = disp.await;
});
// buffer should be flushed
client.remote_buffer_cap(1024);