From 11e768178d08d631b38703d8cc38f2aa9ff83cdb Mon Sep 17 00:00:00 2001 From: Fuwn Date: Mon, 2 Nov 2020 16:31:17 -0800 Subject: refactor, chore, feat (desc) refactor: - `Cargo.toml` openssl patch - rename `DBOTS_TOKEN` environment variable feat: - new `wisp` command information - support server, bot invite, feature request, bot discovery sites. - use `CARGO_PKG_VERSION` environment variable to show version in presence. - `privacypolicy` command - prime more of the rocket webserver --- src/webserver/rocket.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/webserver') diff --git a/src/webserver/rocket.rs b/src/webserver/rocket.rs index ac7401b..78f592a 100644 --- a/src/webserver/rocket.rs +++ b/src/webserver/rocket.rs @@ -1,8 +1,15 @@ use rocket::response::content; use rocket::{State, get, post, request::Form, routes}; use rocket::response::NamedFile; +use rocket_contrib::json::Json; // use std::sync::Arc; use crate::webserver::model::*; +use sysinfo::{ + ProcessExt, + SystemExt, + System, + get_current_pid +}; pub async fn start_rocket() -> WispResult { // ctx: WispData rocket::ignite() @@ -22,3 +29,16 @@ pub fn icon() -> Option { pub fn index() -> content::Json<&'static str> { content::Json("{\"message\": \"online\"}") } + +#[get("/")] +pub fn memory_usage() -> Json<&'static str> { + let sys = System::new(); + let mut response; + if let Some(process) = sys.get_process(get_current_pid()) { + // response = format!("{{\"message\": \"{}\"}}", process.memory()/1000); + } else { + response = "{\"message\": \"null\"}".to_string(); + } + + Json(Json(&response)) +} -- cgit v1.2.3