engine: more informative error log

pveber · Jan 4, 2019 · 40a5ec8 · 40a5ec8
1 parent 8016027
commit 40a5ec8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/engine/execution_trace.ml b/lib/engine/execution_trace.ml
@@ -62,11 +62,10 @@ let error_report trace db buf =
   match trace with
   | Run { outcome ; _ } ->
     if not (Task_result.succeeded outcome) then
-      let tid = Task_result.id outcome in
-      let title = sprintf "Task %s failed\n" tid in
+      let title = sprintf "Task %s failed\n" (Task_result.name outcome) in
       let short_descr = Task_result.error_short_descr outcome in
       error_title buf title short_descr ;
-      Task_result.error_long_descr outcome db buf tid
+      Task_result.error_long_descr outcome db buf (Task_result.id outcome)
   | Allocation_error { id ; msg } ->
     let title = sprintf "Task %s failed\n" id in
     let short_descr = sprintf "Allocation error: %s\n" msg in

diff --git a/lib/engine/task_result.ml b/lib/engine/task_result.ml
@@ -32,6 +32,14 @@ let id = function
   | Plugin { id ; _ }
   | Container_image_fetch { id ; _ } -> id
 
+let name = function
+  | Input { id ;  path ; _ } -> sprintf "input(%s, %s)" id path
+  | Select { dir_path ; sel ; _ } ->
+    sprintf "select(%s, %s)" dir_path (Path.to_string sel)
+  | Shell { id ; descr ; _ } -> sprintf "shell(%s,%s)" descr id
+  | Plugin { id ; descr ; _ } -> sprintf "plugin(%s,%s)" descr id
+  | Container_image_fetch { id ; _ } -> sprintf "container_image_fetch(%s)" id
+
 let succeeded_of_outcome = function
   | `Succeeded -> true
   | `Failed | `Missing_output -> false

diff --git a/lib/engine/task_result.mli b/lib/engine/task_result.mli
@@ -25,6 +25,8 @@ type t =
 
 val id : t -> string
 
+val name : t -> string
+
 val succeeded : t -> bool
 
 val error_short_descr : t -> string