facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: add context to the failed hook

Browse Source 
Summary: Makes it easier to debug

Reviewed By: farnz

Differential Revision: D10869139

fbshipit-source-id: 000a39f53418e343307dd2009620d6a674235239
This commit is contained in:
Stanislau Hlebik 2018-10-29 15:47:29 -07:00 committed by Facebook Github Bot
parent b37ee8bd4a
commit 1b0b0066d1
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hooks/src/lib.rs
View File

@ -55,7 +55,7 @@ use blobrepo::{BlobRepo, HgBlobChangeset};
use bookmarks::Bookmark;
use bytes::Bytes;
pub use errors::*;
use failure::Error;
use failure::{Error, FutureFailureErrorExt};
use futures::{failed, finished, Future, IntoFuture, Stream};
use futures_ext::{BoxFuture, FutureExt};
use mercurial_types::{Changeset, HgChangesetId, HgParents, MPath, manifest::get_empty_manifest,
@ -261,7 +261,12 @@ impl HookManager {
) -> BoxFuture<(String, HookExecution), Error> {
let hook_name = hook_context.hook_name.clone();
hook.run(hook_context)
.map(move |he| (hook_name, he))
.map({
cloned!(hook_name);
move |he| (hook_name, he)
})
.with_context(move |_| format!("while executing hook {}", hook_name))
.from_err()
.boxify()
}
@ -390,7 +395,13 @@ impl HookManager {
logger: Logger,
) -> BoxFuture<(FileHookExecutionID, HookExecution), Error> {
debug!(logger, "Running file hook {:?}", key);
cache.get(key.clone()).map(|he| (key, he)).boxify()
let hook_name = key.hook_name.clone();
cache
.get(key.clone())
.map(|he| (key, he))
.with_context(move |_| format!("while executing hook {}", hook_name))
.from_err()
.boxify()
}
fn get_hook_changeset(&self, changeset_id: HgChangesetId) -> BoxFuture<HookChangeset, Error> {