Cargo.toml

@@ -27,7 +27,7 @@ time = { version = "0.3.15", features = [
 httpdate = "1.0.2"
 sha2 = "0.10.6"
 path_macro = "1.0.0"
-hex-literal = "0.4.0"
+hex-literal = "0.3.4"
 hex = { version = "0.4.3", features = ["serde"] }
 temp-dir = "0.1.11"
 zip = { version = "0.6.4", default-features = false, features = [
@@ -54,7 +54,6 @@ shadow-rs = "0.21.0"
 walkdir = "2.3.2"
 rust-embed = { version = "6.6.1", features = ["poem-ex"] }
 image = "0.24.6"
-clokwerk = { version = "0.4.0", default-features = false }
 
 [dev-dependencies]
 rstest = "0.17.0"

src/config.rs

@@ -80,26 +80,10 @@ impl Config {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(default)]
 pub struct ServerCfg {
-    /// Address to bind the server to
-    ///
-    /// Default: `0.0.0.0:3000`
     pub address: String,
-    /// Root domain (and port if non-standard) under which Talon is available
-    ///
-    /// Default: `localhost:3000`
     pub root_domain: String,
-    /// Subdomain used for Talon internals (API, assets)
-    ///
-    /// Default: `talon`
     pub internal_subdomain: String,
-    /// URL under which the internals are available
-    ///
-    /// Default: `http://talon.localhost:3000`
     pub internal_url: String,
-    /// Interval in minutes between file storage purges
-    ///
-    /// Default: 1440 (24h)
-    pub purge_interval: u32,
 }
 
 impl Default for ServerCfg {
@@ -109,7 +93,6 @@ impl Default for ServerCfg {
             root_domain: "localhost:3000".to_owned(),
             internal_subdomain: "talon".to_owned(),
             internal_url: "http://talon.localhost:3000".to_owned(),
-            purge_interval: 1440,
         }
     }
 }

src/server.rs

@@ -1,4 +1,4 @@
-use std::{ops::Deref, path::Path, sync::Arc, time::Duration};
+use std::{ops::Deref, path::Path, sync::Arc};
 
 use crate::{
     assets,
@@ -10,7 +10,6 @@ use crate::{
     storage::Storage,
     util,
 };
-use clokwerk::{Interval, Scheduler};
 use path_macro::path;
 use poem::{
     http::header, listener::TcpListener, middleware, Endpoint, EndpointExt, Route, RouteDomain,
@@ -69,7 +68,7 @@ impl Talon {
         let storage = Storage::new(storage_dir, db.clone(), cfg.clone());
         let icons = Icons::new(icons_dir);
 
-        let talon = Self {
+        Ok(Self {
             i: TalonInner {
                 cfg,
                 db,
@@ -78,24 +77,7 @@ impl Talon {
                 start_time: OffsetDateTime::now_utc(),
             }
             .into(),
-        };
-
-        Ok(talon)
-    }
-
-    fn scheduler(&self) -> Scheduler {
-        let mut scheduler = Scheduler::new();
-        let talon = self.clone();
-        scheduler
-            .every(Interval::Minutes(self.cfg.server.purge_interval))
-            .run(move || {
-                log::info!("Starting purge");
-                match talon.storage.purge() {
-                    Ok((files, freed)) => log::info!("{files} files purged, {freed} bytes freed"),
-                    Err(e) => log::error!("purge error: {e}"),
-                }
-            });
-        scheduler
+        })
     }
 
     pub fn endpoint(&self) -> impl Endpoint {
@@ -147,9 +129,6 @@ impl Talon {
     }
 
     pub async fn launch(&self) -> Result<()> {
-        let scheduler = self.scheduler();
-        let _scheduler_handle = scheduler.watch_thread(Duration::from_secs(1));
-
         Server::new(TcpListener::bind(&self.i.cfg.server.address))
             .run_with_graceful_shutdown(self.endpoint(), Self::shutdown_signal(), None)
             .await?;

tests/snapshots/tests__config__default.snap

@@ -8,7 +8,6 @@ ConfigInner(
     root_domain: "example.com",
     internal_subdomain: "talon-i",
     internal_url: "http://talon-i.example.com",
-    purge_interval: 60,
   ),
   compression: CompressionCfg(
     gzip_en: true,

tests/snapshots/tests__config__sparse.snap

@@ -8,7 +8,6 @@ ConfigInner(
     root_domain: "localhost:3000",
     internal_subdomain: "talon",
     internal_url: "http://talon.localhost:3000",
-    purge_interval: 1440,
   ),
   compression: CompressionCfg(
     gzip_en: true,

tests/testfiles/config/config.toml

@@ -3,7 +3,6 @@ address = "127.0.0.1:3000"
 root_domain = "example.com"
 internal_subdomain = "talon-i"
 internal_url = "http://talon-i.example.com"
-purge_interval = 60
 
 # Talon compresses files when they are uploaded
 # Here you can configure compression algorithms and levels