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

Add request stats to instance info page

Browse source
This commit is contained in:
Matthew Esposito 2023-05-31 19:39:44 -04:00
parent 193a6effbf
commit de68409610
No known key found for this signature in database
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client.rs
View file

@ -10,6 +10,7 @@ use serde_json::Value;
use std::{io, result::Result}; use std::{io, result::Result};
use crate::dbg_msg; use crate::dbg_msg;
use crate::instance_info::INSTANCE_INFO;
use crate::server::RequestExt; use crate::server::RequestExt;
const REDDIT_URL_BASE: &str = "https://www.reddit.com"; const REDDIT_URL_BASE: &str = "https://www.reddit.com";
@ -125,6 +126,9 @@ fn reddit_head(path: String, quarantine: bool) -> Boxed<Result<Response<Body>, S
/// will recurse on the URL that Reddit provides in the Location HTTP header /// will recurse on the URL that Reddit provides in the Location HTTP header
/// in its response. /// in its response.
fn request(method: &'static Method, path: String, redirect: bool, quarantine: bool) -> Boxed<Result<Response<Body>, String>> { fn request(method: &'static Method, path: String, redirect: bool, quarantine: bool) -> Boxed<Result<Response<Body>, String>> {
// Increment reddit request count. This will include head requests.
INSTANCE_INFO.reddit_requests.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
// Build Reddit URL from path. // Build Reddit URL from path.
let url = format!("{}{}", REDDIT_URL_BASE, path); let url = format!("{}{}", REDDIT_URL_BASE, path);

6
src/instance_info.rs
View file

@ -1,3 +1,5 @@
use std::sync::atomic::AtomicU32;
use crate::{ use crate::{
config::{Config, CONFIG}, config::{Config, CONFIG},
server::RequestExt, server::RequestExt,
@ -88,6 +90,8 @@ pub(crate) struct InstanceInfo {
deploy_date: String, deploy_date: String,
compile_mode: String, compile_mode: String,
deploy_unix_ts: i64, deploy_unix_ts: i64,
pub(crate) reddit_requests: AtomicU32,
pub(crate) total_requests: AtomicU32,
config: Config, config: Config,
} }
@ -103,6 +107,8 @@ impl InstanceInfo {
compile_mode: "Release".into(), compile_mode: "Release".into(),
deploy_unix_ts: OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()).unix_timestamp(), deploy_unix_ts: OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()).unix_timestamp(),
config: CONFIG.clone(), config: CONFIG.clone(),
reddit_requests: AtomicU32::new(0),
total_requests: AtomicU32::new(0),
} }
} }
fn to_table(&self) -> String { fn to_table(&self) -> String {

4
src/server.rs
View file

@ -23,7 +23,7 @@ use std::{
}; };
use time::Duration; use time::Duration;
use crate::dbg_msg; use crate::{dbg_msg, instance_info::INSTANCE_INFO};
type BoxResponse = Pin<Box<dyn Future<Output = Result<Response<Body>, String>> + Send>>; type BoxResponse = Pin<Box<dyn Future<Output = Result<Response<Body>, String>> + Send>>;
@ -234,6 +234,8 @@ impl Server {
match router.recognize(&format!("/{}{}", req.method().as_str(), path)) { match router.recognize(&format!("/{}{}", req.method().as_str(), path)) {
// If a route was configured for this path // If a route was configured for this path
Ok(found) => { Ok(found) => {
// Add to total_requests count
INSTANCE_INFO.total_requests.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
let mut parammed = req; let mut parammed = req;
parammed.set_params(found.params().clone()); parammed.set_params(found.params().clone());