forked from lavina/lavina
Compare commits
No commits in common. "825d41fa3ac40ec1faf86ce8819dfdbafed6c787" and "a8a4b1c4902fdb753bd1ef7f5bd71dd3951255ce" have entirely different histories.
825d41fa3a
...
a8a4b1c490
|
@ -65,7 +65,7 @@ pub struct Services {
|
|||
pub(crate) broadcasting: Broadcasting,
|
||||
pub(crate) client: LavinaClient,
|
||||
pub(crate) storage: Storage,
|
||||
pub(crate) cluster_metadata: ClusterMetadata,
|
||||
pub(crate) cluster_metadata: Arc<ClusterMetadata>,
|
||||
}
|
||||
|
||||
impl LavinaCore {
|
||||
|
@ -88,7 +88,7 @@ impl LavinaCore {
|
|||
broadcasting,
|
||||
client,
|
||||
storage,
|
||||
cluster_metadata: cluster_config.metadata,
|
||||
cluster_metadata: Arc::new(cluster_config.metadata),
|
||||
};
|
||||
|
||||
Ok(LavinaCore {
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
use quick_xml::events::Event;
|
||||
|
||||
use lavina_core::room::RoomId;
|
||||
use lavina_core::LavinaCore;
|
||||
use lavina_core::room::RoomId;
|
||||
use proto_xmpp::bind::{BindRequest, BindResponse, Jid, Name, Server};
|
||||
use proto_xmpp::client::{Iq, IqError, IqErrorType, IqType};
|
||||
use proto_xmpp::disco::{Feature, Identity, InfoQuery, Item, ItemQuery};
|
||||
|
|
|
@ -85,9 +85,9 @@ impl<'a> XmppConnection<'a> {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use anyhow::Result;
|
||||
use crate::testkit::{expect_user_authenticated, TestServer};
|
||||
use crate::Authenticated;
|
||||
use anyhow::Result;
|
||||
use lavina_core::player::PlayerId;
|
||||
use proto_xmpp::bind::{Jid, Name, Resource, Server};
|
||||
use proto_xmpp::client::Presence;
|
||||
|
|
|
@ -29,7 +29,11 @@ pub struct ServerConfig {
|
|||
pub listen_on: SocketAddr,
|
||||
}
|
||||
|
||||
pub async fn launch(config: ServerConfig, metrics: MetricsRegistry, core: LavinaCore) -> Result<Terminator> {
|
||||
pub async fn launch(
|
||||
config: ServerConfig,
|
||||
metrics: MetricsRegistry,
|
||||
core: LavinaCore,
|
||||
) -> Result<Terminator> {
|
||||
log::info!("Starting the http service");
|
||||
let listener = TcpListener::bind(config.listen_on).await?;
|
||||
log::debug!("Listener started");
|
||||
|
|
Loading…
Reference in New Issue