discours.io/quoter
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debloat-logs

Browse Source
This commit is contained in:
Untone 2024-10-22 09:52:05 +03:00
parent 74b1be650f
commit 1385f64824
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app_state.rs
View File

@ -189,8 +189,8 @@ impl AppState {
let parts: Vec<&str> = key.split('.').collect(); let parts: Vec<&str> = key.split('.').collect();
let storj_filekey = parts.first().and_then(|s| s.split('/').last()).unwrap_or(parts.first().unwrap()); let storj_filekey = parts.first().and_then(|s| s.split('/').last()).unwrap_or(parts.first().unwrap());
if storj_filekey.is_empty() && !storj_filekey.ends_with("/") { if storj_filekey.is_empty() && !storj_filekey.ends_with('/') {
eprint!("[ERROR] empty filename: {}\n", key); eprint!("empty filename: {}\n", key);
} else { } else {
// Проверяем, существует ли файл на Storj S3 // Проверяем, существует ли файл на Storj S3
match check_file_exists(&self.storj_client, &self.storj_bucket, &storj_filekey).await match check_file_exists(&self.storj_client, &self.storj_bucket, &storj_filekey).await
@ -200,7 +200,7 @@ impl AppState {
if let Err(e) = if let Err(e) =
self.save_aws2storj_mapping(&key, &storj_filekey).await self.save_aws2storj_mapping(&key, &storj_filekey).await
{ {
eprintln!("[ERROR] save {}: {:?}", key, e); eprintln!("save {}: {:?}", key, e);
} else { } else {
println!("[ok] {}", key); println!("[ok] {}", key);
} }
@ -210,7 +210,7 @@ impl AppState {
} }
Err(e) => { Err(e) => {
eprintln!( eprintln!(
"[ERROR] check {}: {:?}", "check {}: {:?}",
storj_filekey, e storj_filekey, e
); );
} }
@ -223,7 +223,7 @@ impl AppState {
} }
} }
Err(e) => { Err(e) => {
eprintln!("[ERROR] get AWS S3 file list: {:?}", e); eprintln!("get AWS S3 file list: {:?}", e);
} }
} }
} }

26
src/handlers/proxy.rs
View File

@ -12,38 +12,38 @@ pub async fn proxy_handler(
requested_res: web::Path<String>, requested_res: web::Path<String>,
state: web::Data<AppState>, state: web::Data<AppState>,
) -> Result<HttpResponse, actix_web::Error> { ) -> Result<HttpResponse, actix_web::Error> {
info!("[proxy_handler] req.path: {}", req.path()); info!("req.path: {}", req.path());
let requested_path = match state.get_path(&requested_res).await { let requested_path = match state.get_path(&requested_res).await {
Ok(Some(path)) => path, Ok(Some(path)) => path,
Ok(None) => { Ok(None) => {
warn!("[proxy_handler] wrong request: {}", req.path()); warn!("wrong request: {}", req.path());
return Ok(HttpResponse::NotFound().finish()); return Ok(HttpResponse::NotFound().finish());
} }
Err(e) => { Err(e) => {
warn!("[proxy_handler] error: {}", e); warn!("error: {}", e);
return Ok(HttpResponse::InternalServerError().finish()); return Ok(HttpResponse::InternalServerError().finish());
} }
}; };
info!("[proxy_handler] requested path: {}", requested_path); info!("requested path: {}", requested_path);
// Проверяем, запрошена ли миниатюра // Проверяем, запрошена ли миниатюра
if let Some((base_filename, requested_width, extension)) = if let Some((base_filename, requested_width, extension)) =
parse_thumbnail_request(&requested_res) parse_thumbnail_request(&requested_res)
{ {
info!("[proxy_handler] thumbnail requested: {} width: {}, ext: {}", base_filename, requested_width, extension); info!("thumbnail requested: {} width: {}, ext: {}", base_filename, requested_width, extension);
// Находим ближайший подходящий размер // Находим ближайший подходящий размер
let closest_width = find_closest_width(requested_width); let closest_width = find_closest_width(requested_width);
let thumb_filekey = format!("{}_{}", base_filename, closest_width); let thumb_filekey = format!("{}_{}", base_filename, closest_width);
info!("[proxy_handler] closest width: {}, thumb_filekey: {}", closest_width, thumb_filekey); info!("closest width: {}, thumb_filekey: {}", closest_width, thumb_filekey);
// Проверяем наличие миниатюры в кэше // Проверяем наличие миниатюры в кэше
let cached_files = state.get_cached_file_list().await; let cached_files = state.get_cached_file_list().await;
if !cached_files.contains(&thumb_filekey) { if !cached_files.contains(&thumb_filekey) {
info!("[proxy_handler] no thumb found"); info!("no thumb found");
if cached_files.contains(&base_filename) { if cached_files.contains(&base_filename) {
info!("[proxy_handler] no original file found"); info!("no original file found");
// Загружаем оригинальный файл из S3 // Загружаем оригинальный файл из S3
let original_data: Vec<u8> = let original_data: Vec<u8> =
load_file_from_s3(&state.storj_client, &state.storj_bucket, &base_filename).await?; load_file_from_s3(&state.storj_client, &state.storj_bucket, &base_filename).await?;
@ -65,25 +65,25 @@ pub async fn proxy_handler(
"image/jpeg", "image/jpeg",
) )
.await?; .await?;
info!("[proxy_handler] thumb was saved in storj"); info!("thumb was saved in storj");
return Ok(HttpResponse::Ok() return Ok(HttpResponse::Ok()
.content_type("image/jpeg") .content_type("image/jpeg")
.body(thumbnail_bytes)); .body(thumbnail_bytes));
} else { } else {
warn!("[proxy_handler] original was not found"); warn!("original was not found");
} }
} else { } else {
info!("[proxy_handler] thumb was found"); info!("thumb was found");
return serve_file(&thumb_filekey, &state).await; return serve_file(&thumb_filekey, &state).await;
} }
} }
// Если запрошен целый файл // Если запрошен целый файл
info!("[proxy_handler] serving full file: {}", requested_path); info!("serving full file: {}", requested_path);
match serve_file(&requested_path, &state).await { match serve_file(&requested_path, &state).await {
Ok(response) => Ok(response), Ok(response) => Ok(response),
Err(e) => { Err(e) => {
error!("[proxy_handler] error: {}", e); error!("error: {}", e);
Err(e) Err(e)
} }
} }