nik/chorus
1
0
Fork 0
mirror of https://github.com/mikedilger/chorus.git synced 2026-08-01 07:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put back http1builder into globals and clone as needed

Browse Source
This commit is contained in:
Mike Dilger 2024-06-22 16:40:14 +12:00
parent a505119efe
commit 5112e08527
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/globals.rs
View File

@ -1,12 +1,13 @@
use crate::config::Config;
use crate::ip::HashedIp;
use dashmap::DashMap;
use hyper::server::conn::http1;
use lazy_static::lazy_static;
use parking_lot::RwLock;
use pocket_db::Store;
use std::sync::atomic::{AtomicU64, AtomicUsize};
use std::sync::OnceLock;
use std::time::Instant;
use std::time::{Duration, Instant};
use tokio::sync::broadcast::Sender as BroadcastSender;
use tokio::sync::watch::Sender as WatchSender;
@ -16,6 +17,7 @@ pub struct Globals {
pub bytes_outbound: AtomicU64,
pub config: RwLock<Config>,
pub store: OnceLock<Store>,
pub http1builder: http1::Builder,
pub rid: OnceLock<String>,
/// This is a broadcast channel where new incoming events are advertised by their offset.
@ -34,12 +36,18 @@ lazy_static! {
let (new_events, _) = tokio::sync::broadcast::channel(512);
let (shutting_down, _) = tokio::sync::watch::channel(false);
let mut http1builder = http1::Builder::new();
http1builder.half_close(true);
http1builder.keep_alive(true);
http1builder.header_read_timeout(Duration::from_secs(5));
Globals {
start_time: Instant::now(),
bytes_inbound: AtomicU64::new(0),
bytes_outbound: AtomicU64::new(0),
config: RwLock::new(Default::default()),
store: OnceLock::new(),
http1builder,
rid: OnceLock::new(),
new_events,
num_connections: AtomicUsize::new(0),

6
src/lib.rs
View File

@ -17,7 +17,6 @@ use crate::reply::NostrReply;
use futures::{sink::SinkExt, stream::StreamExt};
use http_body_util::Full;
use hyper::body::{Bytes, Incoming};
use hyper::server::conn::http1;
use hyper::service::Service;
use hyper::upgrade::Upgraded;
use hyper::StatusCode;
@ -57,10 +56,7 @@ pub async fn serve(stream: Box<dyn FullStream>, peer: HashedPeer) {
let io = hyper_util::rt::TokioIo::new(stream);
let mut http1builder = http1::Builder::new();
http1builder.half_close(true);
http1builder.keep_alive(true);
http1builder.header_read_timeout(Duration::from_secs(5));
let http1builder = GLOBALS.http1builder.clone();
let connection = http1builder.serve_connection(io, service).with_upgrades();
// If our service exits with an error, log the error