Page MenuHomePhorge
Files F33305379

D9413.1768790624.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D9413.1768790624.diff
View Options

diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile
--- a/services/blob/Dockerfile
+++ b/services/blob/Dockerfile
@@ -38,5 +38,5 @@
ENV RUST_LOG=info
-CMD ["blob"]
+CMD ["blob", "server"]
diff --git a/services/blob/src/config.rs b/services/blob/src/config.rs
--- a/services/blob/src/config.rs
+++ b/services/blob/src/config.rs
@@ -11,7 +11,7 @@
#[command(version, about, long_about = None)]
pub struct AppConfig {
/// HTTP server listening port
- #[arg(long, default_value_t = DEFAULT_HTTP_PORT)]
+ #[arg(long, default_value_t = DEFAULT_HTTP_PORT, global = true)]
pub http_port: u16,
/// AWS Localstack service URL
#[arg(env = "LOCALSTACK_ENDPOINT")]
@@ -24,6 +24,15 @@
#[arg(env = "IDENTITY_SERVICE_ENDPOINT")]
#[arg(long, default_value = "http://localhost:50054")]
pub identity_endpoint: String,
+
+ #[clap(subcommand)]
+ pub command: Option<Command>,
+}
+
+#[derive(clap::Subcommand)]
+pub enum Command {
+ Server,
+ Cleanup,
}
/// Stores configuration parsed from command-line arguments
diff --git a/services/blob/src/main.rs b/services/blob/src/main.rs
--- a/services/blob/src/main.rs
+++ b/services/blob/src/main.rs
@@ -8,6 +8,7 @@
use anyhow::Result;
use comm_services_lib::auth::AuthService;
+use config::Command;
use tracing_subscriber::filter::{EnvFilter, LevelFilter};
use crate::service::BlobServiceConfig;
@@ -33,14 +34,15 @@
let s3 = s3::S3Client::new(&aws_config);
let auth_service = AuthService::new(&aws_config, &config.identity_endpoint);
- let blob_service = service::BlobService::new(
- db,
- s3,
- BlobServiceConfig {
- instant_delete_orphaned_blobs: true,
- ..Default::default()
- },
- );
+ let blob_service =
+ service::BlobService::new(db, s3, BlobServiceConfig::default());
- crate::http::run_http_server(blob_service, auth_service).await
+ match &config.command {
+ Some(Command::Cleanup) => blob_service.perform_cleanup().await?,
+ None | Some(Command::Server) => {
+ crate::http::run_http_server(blob_service, auth_service).await?
+ }
+ };
+
+ Ok(())
}

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 2:43 AM (16 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5953988
Default Alt Text
D9413.1768790624.diff (2 KB)

Event Timeline