From 71e37ed3c634cf54642b5c9c4c66941f7ffac0a3 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Tue, 16 Apr 2024 00:22:29 +0200 Subject: [PATCH] Fix --- src/services/files_cleaner.rs | 4 ++-- src/services/task_creator.rs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/services/files_cleaner.rs b/src/services/files_cleaner.rs index 0863913..b2e3f84 100644 --- a/src/services/files_cleaner.rs +++ b/src/services/files_cleaner.rs @@ -1,10 +1,10 @@ use chrono::{DateTime, Duration, Utc}; use minio_rsc::{client::ListObjectsArgs, datatype::Object}; -use super::minio::get_minio; +use super::minio::get_internal_minio; pub async fn clean_files(bucket: String) -> Result<(), Box> { - let minio_client = get_minio(); + let minio_client = get_internal_minio(); let objects = minio_client .list_objects(&bucket, ListObjectsArgs::default()) diff --git a/src/services/task_creator.rs b/src/services/task_creator.rs index 60835c0..c7db17e 100644 --- a/src/services/task_creator.rs +++ b/src/services/task_creator.rs @@ -100,7 +100,6 @@ pub async fn upload_to_minio( let full_filename = format!("{}/{}", folder_name, filename); let internal_minio = get_internal_minio(); - let minio = get_minio(); let is_bucket_exist = match internal_minio .bucket_exists(&config::CONFIG.minio_bucket) @@ -111,7 +110,9 @@ pub async fn upload_to_minio( }; if !is_bucket_exist { - let _ = minio.make_bucket(&config::CONFIG.minio_bucket, false).await; + let _ = internal_minio + .make_bucket(&config::CONFIG.minio_bucket, false) + .await; } let data_stream = get_stream(Box::new(archive)); @@ -128,6 +129,8 @@ pub async fn upload_to_minio( return Err(Box::new(err)); } + let minio = get_minio(); + let link = match minio .presigned_get_object(PresignedArgs::new( &config::CONFIG.minio_bucket,