nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-11-22 00:59:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

test: improve port selection

Browse Source
This commit is contained in:
Greg Heartsfield 2022-09-28 07:55:06 -05:00
parent 92da9d71f8
commit a4df9445b6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/common/mod.rs
View File

@ -4,6 +4,7 @@ use nostr_rs_relay::server::start_server;
//use http::{Request, Response}; //use http::{Request, Response};
use hyper::{Client, StatusCode, Uri}; use hyper::{Client, StatusCode, Uri};
use std::net::TcpListener; use std::net::TcpListener;
use std::sync::atomic::{AtomicU16, Ordering};
use std::sync::mpsc as syncmpsc; use std::sync::mpsc as syncmpsc;
use std::sync::mpsc::{Receiver as MpscReceiver, Sender as MpscSender}; use std::sync::mpsc::{Receiver as MpscReceiver, Sender as MpscSender};
use std::thread; use std::thread;
@ -20,7 +21,7 @@ pub struct Relay {
pub fn start_relay() -> Result<Relay> { pub fn start_relay() -> Result<Relay> {
// setup tracing // setup tracing
let _trace_sub = tracing_subscriber::fmt::try_init(); let _trace_sub = tracing_subscriber::fmt::try_init();
info!("Starting up from main"); info!("Starting a new relay");
// replace default settings // replace default settings
let mut settings = config::Settings::default(); let mut settings = config::Settings::default();
// identify open port // identify open port
@ -87,10 +88,21 @@ pub async fn wait_for_healthy_relay(relay: &Relay) -> Result<()> {
} }
// from https://elliotekj.com/posts/2017/07/25/find-available-tcp-port-rust/ // from https://elliotekj.com/posts/2017/07/25/find-available-tcp-port-rust/
// This needed some modification; if multiple tasks all ask for open ports, they will tend to get the same one.
// instead we should try to try these incrementally/globally.
static PORT_COUNTER: AtomicU16 = AtomicU16::new(4030);
fn get_available_port() -> Option<u16> { fn get_available_port() -> Option<u16> {
(4030..20000).find(|port| port_is_available(*port)) let startsearch = PORT_COUNTER.fetch_add(10, Ordering::SeqCst);
if startsearch >= 20000 {
// wrap around
PORT_COUNTER.store(4030, Ordering::Relaxed);
}
(startsearch..20000).find(|port| port_is_available(*port))
} }
pub fn port_is_available(port: u16) -> bool { pub fn port_is_available(port: u16) -> bool {
info!("checking on port {}", port);
match TcpListener::bind(("127.0.0.1", port)) { match TcpListener::bind(("127.0.0.1", port)) {
Ok(_) => true, Ok(_) => true,
Err(_) => false, Err(_) => false,

4
tests/integration_test.rs
View File

@ -12,8 +12,6 @@ async fn start_and_stop() -> Result<()> {
let relay = common::start_relay()?; let relay = common::start_relay()?;
// wait for the relay's webserver to start up and deliver a page: // wait for the relay's webserver to start up and deliver a page:
common::wait_for_healthy_relay(&relay).await?; common::wait_for_healthy_relay(&relay).await?;
let relay = common::start_relay()?;
let port = relay.port; let port = relay.port;
// just make sure we can startup and shut down. // just make sure we can startup and shut down.
// if we send a shutdown message before the server is listening, // if we send a shutdown message before the server is listening,
@ -43,5 +41,7 @@ async fn relay_home_page() -> Result<()> {
// get a relay and wait for startup... // get a relay and wait for startup...
let relay = common::start_relay()?; let relay = common::start_relay()?;
common::wait_for_healthy_relay(&relay).await?; common::wait_for_healthy_relay(&relay).await?;
// tell relay to shutdown
let _res = relay.shutdown_tx.send(());
Ok(()) Ok(())
} }