Skip to content

increment upload metric for each successful file #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2019
Merged

increment upload metric for each successful file #469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/db/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
use std::collections::HashMap;
let mut file_paths_and_mimes: HashMap<PathBuf, String> = HashMap::new();

use futures::future::Future;

let mut rt = ::tokio::runtime::Runtime::new().unwrap();

let mut to_upload = try!(get_file_list(&path));
Expand Down Expand Up @@ -205,6 +207,8 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
body: Some(content.clone().into()),
content_type: Some(mime.clone()),
..Default::default()
}).inspect(|_| {
crate::web::metrics::UPLOADED_FILES_TOTAL.inc_by(1);
}));
} else {
// If AWS credentials are configured, don't insert/update the database
Expand All @@ -229,7 +233,6 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,

if rt.block_on(::futures::future::join_all(futures)).is_ok() {
// this batch was successful, start another batch if there are still more files
crate::web::metrics::UPLOADED_FILES_TOTAL.inc_by(batch_size as i64);
batch_size = cmp::min(to_upload.len(), MAX_CONCURRENT_UPLOADS);
currently_uploading = to_upload.drain(..batch_size).collect();
attempts = 0;
Expand All @@ -240,7 +243,6 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
}
}
} else {
crate::web::metrics::UPLOADED_FILES_TOTAL.inc_by(batch_size as i64);
batch_size = cmp::min(to_upload.len(), MAX_CONCURRENT_UPLOADS);
currently_uploading = to_upload.drain(..batch_size).collect();
}
Expand Down