From 94cf4dab98e7b37ebba9c2d411bdf9046bab8dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mina=20Gali=C4=87?= Date: Tue, 4 Aug 2020 21:19:51 +0200 Subject: [PATCH] add ActorSystem member to PlumeRocket --- plume-models/src/lib.rs | 2 ++ plume-models/src/plume_rocket.rs | 4 ++++ src/main.rs | 1 + 3 files changed, 7 insertions(+) diff --git a/plume-models/src/lib.rs b/plume-models/src/lib.rs index 415ae41e..f77f8d44 100644 --- a/plume-models/src/lib.rs +++ b/plume-models/src/lib.rs @@ -17,6 +17,8 @@ extern crate serde_json; #[macro_use] extern crate tantivy; +extern crate riker; + use plume_common::activity_pub::inbox::InboxError; #[cfg(not(any(feature = "sqlite", feature = "postgres")))] diff --git a/plume-models/src/plume_rocket.rs b/plume-models/src/plume_rocket.rs index 0a2b3cec..34b60688 100644 --- a/plume-models/src/plume_rocket.rs +++ b/plume-models/src/plume_rocket.rs @@ -3,6 +3,7 @@ pub use self::module::PlumeRocket; #[cfg(not(test))] mod module { use crate::{db_conn::DbConn, search, users}; + use riker::actors::ActorSystem; use rocket::{ request::{self, FlashMessage, FromRequest, Request}, Outcome, State, @@ -18,6 +19,7 @@ mod module { pub searcher: Arc, pub worker: Arc, pub flash_msg: Option<(String, String)>, + pub actors: Arc, } impl<'a, 'r> FromRequest<'a, 'r> for PlumeRocket { @@ -30,6 +32,7 @@ mod module { let worker = request.guard::<'_, State<'_, Arc>>()?; let searcher = request.guard::<'_, State<'_, Arc>>()?; let flash_msg = request.guard::>().succeeded(); + let actors = request.guard::<'_, State<'_, Arc>>()?; Outcome::Success(PlumeRocket { conn, intl, @@ -37,6 +40,7 @@ mod module { flash_msg: flash_msg.map(|f| (f.name().into(), f.msg().into())), worker: worker.clone(), searcher: searcher.clone(), + actors: actors.clone(), }) } } diff --git a/src/main.rs b/src/main.rs index 41b18a1b..9010f16b 100755 --- a/src/main.rs +++ b/src/main.rs @@ -235,6 +235,7 @@ Then try to restart Plume. .manage(dbpool) .manage(Arc::new(workpool)) .manage(searcher) + .manage(Arc::new(sys)) .manage(include_i18n!()) .attach( CsrfFairingBuilder::new()