HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

chore (backend-rs): cleanup

Browse source
This commit is contained in:
naskya 2024-05-21 16:12:11 +09:00
parent d750af3d79
commit 4bb6f6e0e3
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/backend-rs/src/init/system_info.rs
View file

@ -3,15 +3,15 @@ use sysinfo::System;
pub type SysinfoPoisonError = PoisonError<MutexGuard<'static, System>>;
// TODO: handle this in a more proper way when we move the entry point to backend-rs
pub fn system() -> Result<MutexGuard<'static, System>, SysinfoPoisonError> {
pub static SYSTEM: OnceLock<Mutex<System>> = OnceLock::new();
SYSTEM.get_or_init(|| Mutex::new(System::new_all())).lock()
static SYSTEM_INFO: OnceLock<Mutex<System>> = OnceLock::new();
pub fn system_info() -> &'static std::sync::Mutex<sysinfo::System> {
SYSTEM_INFO.get_or_init(|| Mutex::new(System::new_all()))
}
#[crate::export]
pub fn show_server_info() -> Result<(), SysinfoPoisonError> {
let system_info = system()?;
let system_info = system_info().lock()?;
tracing::info!(
"Hostname: {}",

3
packages/backend-rs/src/misc/reaction.rs
View file

@ -1,5 +1,6 @@
use crate::database::db_conn;
use crate::misc::{convert_host::to_puny, meta::fetch_meta};
use crate::misc::convert_host::to_puny;
use crate::misc::meta::fetch_meta;
use crate::model::entity::emoji;
use once_cell::sync::Lazy;
use regex::Regex;

8
packages/backend-rs/src/misc/system_info.rs
View file

@ -1,4 +1,4 @@
use crate::init::system_info::{system, SysinfoPoisonError};
use crate::init::system_info::{system_info, SysinfoPoisonError};
use sysinfo::{Disks, MemoryRefreshKind};
// TODO: i64 -> u64 (we can't export u64 to Node.js)
@ -30,7 +30,7 @@ pub struct Storage {
#[crate::export]
pub fn cpu_info() -> Result<Cpu, SysinfoPoisonError> {
let system_info = system()?;
let system_info = system_info().lock()?;
Ok(Cpu {
model: match system_info.cpus() {
@ -46,7 +46,7 @@ pub fn cpu_info() -> Result<Cpu, SysinfoPoisonError> {
#[crate::export]
pub fn cpu_usage() -> Result<f32, SysinfoPoisonError> {
let mut system_info = system()?;
let mut system_info = system_info().lock()?;
system_info.refresh_cpu_usage();
let total_cpu_usage: f32 = system_info.cpus().iter().map(|cpu| cpu.cpu_usage()).sum();
@ -57,7 +57,7 @@ pub fn cpu_usage() -> Result<f32, SysinfoPoisonError> {
#[crate::export]
pub fn memory_usage() -> Result<Memory, SysinfoPoisonError> {
let mut system_info = system()?;
let mut system_info = system_info().lock()?;
system_info.refresh_memory_specifics(MemoryRefreshKind::new().with_ram());

3
packages/backend-rs/src/service/antenna.rs
View file

@ -1,5 +1,4 @@
use crate::database::cache;
use crate::database::{db_conn, redis_conn, redis_key, RedisConnError};
use crate::database::{cache, db_conn, redis_conn, redis_key, RedisConnError};
use crate::federation::acct::Acct;
use crate::misc::check_hit_antenna::{check_hit_antenna, AntennaCheckError};
use crate::model::entity::{antenna, note};

3
packages/backend-rs/src/service/nodeinfo/generate.rs
View file

@ -1,6 +1,5 @@
use crate::config::CONFIG;
use crate::database::cache;
use crate::database::db_conn;
use crate::database::{cache, db_conn};
use crate::misc::meta::fetch_meta;
use crate::model::entity::{note, user};
use crate::service::nodeinfo::schema::*;