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

fetch: actix upgrade #193

Merged
merged 2 commits into from
Mar 11, 2022
Merged

fetch: actix upgrade #193

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a393fa
bump actix-governor from 0.2->0.3; actix-web from 3.3->4.0
jqnatividad Mar 11, 2022
24ee931
Update `fetch` rate-limit test for actix-web 4.0/actix-governor 0.3
jqnatividad Mar 11, 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
Prev Previous commit
Update fetch rate-limit test for actix-web 4.0/actix-governor 0.3
  • Loading branch information
@jqnatividad
jqnatividad committed Mar 11, 2022
commit 24ee9312b9078d2e4928a4a0066b9a9c9b73e3da
35 changes: 16 additions & 19 deletions tests/test_fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ fn fetch_custom_header() {
use std::{sync::mpsc, thread};

use actix_web::{
dev::Server, middleware, rt, web, App, HttpRequest, HttpServer, Responder, Result,
dev::ServerHandle, middleware, rt, web, App, HttpRequest, HttpServer, Responder, Result,
};

use serde::Serialize;
Expand All @@ -243,10 +243,7 @@ async fn index() -> impl Responder {

/// handler with path parameters like `/user/{name}/`
/// returns Smurf fullname in JSON format
async fn get_fullname(
req: HttpRequest,
web::Path((name,)): web::Path<(String,)>,
) -> Result<impl Responder> {
async fn get_fullname(req: HttpRequest, name: web::Path<String>) -> Result<impl Responder> {
println!("{:?}", req);

let obj = MyObj {
Expand All @@ -270,21 +267,19 @@ macro_rules! test_url {
}

/// start an Actix Webserver with Rate Limiting via Governor
fn run_webserver(tx: mpsc::Sender<Server>) -> std::io::Result<()> {
let mut sys = rt::System::new("test");

use actix_governor::{Governor, GovernorConfig, GovernorConfigBuilder};
async fn run_webserver(tx: mpsc::Sender<ServerHandle>) -> std::io::Result<()> {
use actix_governor::{Governor, GovernorConfigBuilder};

// Allow bursts with up to five requests per IP address
// and replenishes one element every 250 ms (4 qps)
let governor_conf: GovernorConfig = GovernorConfigBuilder::default()
let governor_conf = GovernorConfigBuilder::default()
.per_millisecond(250)
.burst_size(7)
.finish()
.unwrap();

// srv is server controller type, `dev::Server`
let srv = HttpServer::new(move || {
// server is server controller type, `dev::ServerHandle`
let server = HttpServer::new(move || {
App::new()
// enable logger
.wrap(middleware::Logger::default())
Expand All @@ -296,23 +291,24 @@ fn run_webserver(tx: mpsc::Sender<Server>) -> std::io::Result<()> {
.run();

// send server controller to main thread
let _ = tx.send(srv.clone());
let _ = tx.send(server.handle());

// run future
sys.block_on(srv)
server.await
}

#[test]
fn fetch_ratelimit() {
// start webserver with rate limiting
let (tx, rx) = mpsc::channel();

println!("START Webserver ");
// println!("START Webserver ");
thread::spawn(move || {
let _ = run_webserver(tx);
let server_future = run_webserver(tx);
rt::System::new().block_on(server_future)
});

let srv = rx.recv().unwrap();
let server_handle = rx.recv().unwrap();

// proceed with usual unit test
let wrk = Workdir::new("fetch");
Expand Down Expand Up @@ -379,6 +375,7 @@ fn fetch_ratelimit() {
assert_eq!(got, expected);

// init stop webserver and wait until server gracefully exit
println!("STOPPING Webserver");
rt::System::new("").block_on(srv.stop(true));
// println!("STOPPING Webserver");
// rt::System::new().block_on(srv.stop(true));
rt::System::new().block_on(server_handle.stop(true));
}