diff options
| author | Emilio Jesus Gallego Arias | 2019-09-04 15:00:03 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-09-04 15:00:03 +0200 |
| commit | 6a6a2575c10d05cd0151a83c133825d43bd3cb28 (patch) | |
| tree | a46211ebfa7af615d7edd8359208f8e5dcd5af1d /lib | |
| parent | bcf2dae1e39c6ff27c574a82c4451323a673b15f (diff) | |
| parent | 2d4033152c51eb0b093c79d19a5146995af1b432 (diff) | |
Merge PR #10612: Fix feedback levels
Ack-by: ejgallego
Reviewed-by: gares
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/feedback.mli | 7 | ||||
| -rw-r--r-- | lib/system.ml | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/lib/feedback.mli b/lib/feedback.mli index dc8449ed71..5375d97d57 100644 --- a/lib/feedback.mli +++ b/lib/feedback.mli @@ -74,13 +74,8 @@ val feedback : ?did:doc_id -> ?id:Stateid.t -> ?route:route_id -> feedback_conte (** [set_id_for_feedback route id] Set the defaults for feedback *) val set_id_for_feedback : ?route:route_id -> doc_id -> Stateid.t -> unit -(** {6 output functions} +(** {6 output functions} *) -[msg_notice] do not put any decoration on output by default. If -possible don't mix it with goal output (prefer msg_info or -msg_warning) so that interfaces can dispatch outputs easily. Once all -interfaces use the xml-like protocol this constraint can be -relaxed. *) (* Should we advertise these functions more? Should they be the ONLY allowed way to output something? *) diff --git a/lib/system.ml b/lib/system.ml index b1a9efccfc..8c333ec267 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -300,13 +300,13 @@ let with_time ~batch ~header f x = let y = f x in let tend = get_time() in let msg2 = if batch then "" else " (successful)" in - Feedback.msg_info (header ++ str msg ++ fmt_time_difference tstart tend ++ str msg2); + Feedback.msg_notice (header ++ str msg ++ fmt_time_difference tstart tend ++ str msg2); y with e -> let tend = get_time() in let msg = if batch then "" else "Finished failing transaction in " in let msg2 = if batch then "" else " (failure)" in - Feedback.msg_info (header ++ str msg ++ fmt_time_difference tstart tend ++ str msg2); + Feedback.msg_notice (header ++ str msg ++ fmt_time_difference tstart tend ++ str msg2); raise e (* We use argv.[0] as we don't want to resolve symlinks *) |