oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-31 04:08:30 +00:00
Code Wiki Activity

rename conduit to conduwuit finally

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-14 21:58:01 -05:00
parent c6bf8f5ea1
commit 0317cc8cc5
No known key found for this signature in database
277 changed files with 559 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/server.rs
View file

@ -1,6 +1,6 @@
use std::sync::Arc;
use conduit::{config::Config, info, log::Log, utils::sys, Error, Result};
use conduwuit::{config::Config, info, log::Log, utils::sys, Error, Result};
use tokio::{runtime, sync::Mutex};
use crate::{clap::Args, logging::TracingFlameGuard};
@ -8,18 +8,18 @@ use crate::{clap::Args, logging::TracingFlameGuard};
/// Server runtime state; complete
pub(crate) struct Server {
/// Server runtime state; public portion
pub(crate) server: Arc<conduit::Server>,
pub(crate) server: Arc<conduwuit::Server>,
pub(crate) services: Mutex<Option<Arc<conduit_service::Services>>>,
pub(crate) services: Mutex<Option<Arc<conduwuit_service::Services>>>,
_tracing_flame_guard: TracingFlameGuard,
#[cfg(feature = "sentry_telemetry")]
_sentry_guard: Option<::sentry::ClientInitGuard>,
#[cfg(conduit_mods)]
#[cfg(conduwuit_mods)]
// Module instances; TODO: move to mods::loaded mgmt vector
pub(crate) mods: tokio::sync::RwLock<Vec<conduit::mods::Module>>,
pub(crate) mods: tokio::sync::RwLock<Vec<conduwuit::mods::Module>>,
}
impl Server {
@ -45,11 +45,11 @@ impl Server {
database_path = ?config.database_path,
log_levels = %config.log,
"{}",
conduit::version(),
conduwuit::version(),
);
Ok(Arc::new(Self {
server: Arc::new(conduit::Server::new(
server: Arc::new(conduwuit::Server::new(
config,
runtime.cloned(),
Log {
@ -65,7 +65,7 @@ impl Server {
#[cfg(feature = "sentry_telemetry")]
_sentry_guard: sentry_guard,
#[cfg(conduit_mods)]
#[cfg(conduwuit_mods)]
mods: tokio::sync::RwLock::new(Vec::new()),
}))
}