diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-11-13 08:58:41 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-11-13 09:49:16 +0100 |
commit | 46d43a9fb52b3b07d575661038a888fa691bad63 (patch) | |
tree | 135a7c29bbce94157621723de37e575169afa617 /src/endpoint/configured.rs | |
parent | d90317895e0762c19a3e0316f6df8de6a48e0d61 (diff) |
Report container hash after running job on endpoint
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/endpoint/configured.rs')
-rw-r--r-- | src/endpoint/configured.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/endpoint/configured.rs b/src/endpoint/configured.rs index 0298919..5d27fbf 100644 --- a/src/endpoint/configured.rs +++ b/src/endpoint/configured.rs @@ -19,6 +19,7 @@ use crate::filestore::StagingStore; use crate::job::JobResource; use crate::job::RunnableJob; use crate::log::LogItem; +use crate::util::docker::ContainerHash; use crate::util::docker::ImageName; #[derive(Getters, CopyGetters, TypedBuilder)] @@ -162,7 +163,7 @@ impl Endpoint { .map(|_| ()) } - pub async fn run_job(&self, job: RunnableJob, logsink: UnboundedSender<LogItem>, staging: Arc<RwLock<StagingStore>>) -> Result<Vec<PathBuf>> { + pub async fn run_job(&self, job: RunnableJob, logsink: UnboundedSender<LogItem>, staging: Arc<RwLock<StagingStore>>) -> Result<(Vec<PathBuf>, ContainerHash)> { use crate::log::buffer_stream_to_line_stream; use tokio::stream::StreamExt; use futures::FutureExt; @@ -299,8 +300,8 @@ impl Endpoint { container.stop(Some(std::time::Duration::new(1, 0))).await?; - trace!("Returning job {} result = {:?}", job.uuid(), r); - Ok(r) + trace!("Returning job {} result = {:?}, container hash = {}", job.uuid(), r, container_id); + Ok((r, ContainerHash::from(container_id))) } pub async fn number_of_running_containers(&self) -> Result<usize> { |