WIP: use apalis to schedule jobs

crates/cli/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
+apalis-core = "0.4.0-alpha.4"
 anyhow = "1.0.69"
 atty = "0.2.14"
 axum = "0.6.11"

crates/cli/src/commands/mod.rs

@@ -23,6 +23,7 @@ mod debug;
 mod manage;
 mod server;
 mod templates;
+mod worker;
 
 #[derive(Parser, Debug)]
 enum Subcommand {
@@ -35,6 +36,9 @@ enum Subcommand {
     /// Runs the web server
     Server(self::server::Options),
 
+    /// Run the worker
+    Worker(self::worker::Options),
+
     /// Manage the instance
     Manage(self::manage::Options),
 
@@ -62,6 +66,7 @@ impl Options {
             Some(S::Config(c)) => c.run(self).await,
             Some(S::Database(c)) => c.run(self).await,
             Some(S::Server(c)) => c.run(self).await,
+            Some(S::Worker(c)) => c.run(self).await,
             Some(S::Manage(c)) => c.run(self).await,
             Some(S::Templates(c)) => c.run(self).await,
             Some(S::Debug(c)) => c.run(self).await,

crates/cli/src/commands/server.rs

@@ -22,7 +22,6 @@ use mas_handlers::{AppState, HttpClientFactory, MatrixHomeserver};
 use mas_listener::{server::Server, shutdown::ShutdownStream};
 use mas_router::UrlBuilder;
 use mas_storage_pg::MIGRATOR;
-use mas_tasks::TaskQueue;
 use tokio::signal::unix::SignalKind;
 use tracing::{info, info_span, warn, Instrument};
 
@@ -37,6 +36,10 @@ pub(super) struct Options {
     #[arg(long)]
     migrate: bool,
 
+    /// Do not start the task worker
+    #[arg(long)]
+    no_worker: bool,
+
     /// Watch for changes for templates on the filesystem
     #[arg(short, long)]
     watch: bool,
@@ -61,11 +64,6 @@ impl Options {
                 .context("could not run migrations")?;
         }
 
-        info!("Starting task scheduler");
-        let queue = TaskQueue::default();
-        queue.recuring(Duration::from_secs(15), mas_tasks::cleanup_expired(&pool));
-        queue.start();
-
         // Initialize the key store
         let key_store = config
             .secrets
@@ -85,8 +83,15 @@ impl Options {
         // Load and compile the templates
         let templates = templates_from_config(&config.templates, &url_builder).await?;
 
-        let mailer = mailer_from_config(&config.email, &templates).await?;
-        mailer.test_connection().await?;
+        if !self.no_worker {
+            let mailer = mailer_from_config(&config.email, &templates).await?;
+            mailer.test_connection().await?;
+
+            info!("Starting task worker");
+            let monitor = mas_tasks::init(&pool, &mailer);
+            // TODO: grab the handle
+            tokio::spawn(monitor.run());
+        }
 
         let homeserver = MatrixHomeserver::new(config.matrix.homeserver.clone());
 
@@ -113,7 +118,6 @@ impl Options {
             key_store,
             encrypter,
             url_builder,
-            mailer,
             homeserver,
             policy_factory,
             graphql_schema,

crates/cli/src/commands/worker.rs

@@ -0,0 +1,51 @@
+// Copyright 2023 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use clap::Parser;
+use mas_config::RootConfig;
+use mas_router::UrlBuilder;
+use tracing::{info_span, log::info};
+
+use crate::util::{database_from_config, mailer_from_config, templates_from_config};
+
+#[derive(Parser, Debug, Default)]
+pub(super) struct Options {}
+
+impl Options {
+    pub async fn run(&self, root: &super::Options) -> anyhow::Result<()> {
+        let span = info_span!("cli.worker.init").entered();
+        let config: RootConfig = root.load_config()?;
+
+        // Connect to the database
+        info!("Conntecting to the database");
+        let pool = database_from_config(&config.database).await?;
+
+        let url_builder = UrlBuilder::new(config.http.public_base.clone());
+
+        // Load and compile the templates
+        let templates = templates_from_config(&config.templates, &url_builder).await?;
+
+        let mailer = mailer_from_config(&config.email, &templates).await?;
+        mailer.test_connection().await?;
+        drop(config);
+
+        info!("Starting task scheduler");
+        let monitor = mas_tasks::init(&pool, &mailer);
+
+        span.exit();
+
+        monitor.run().await?;
+        Ok(())
+    }
+}