balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use text: string option since text may be absent

Browse Source 
see https://gitlab.com/tezos/tezos/merge_requests/411#note_83833997
This commit is contained in:
James Deikun 2018-06-28 23:00:19 -04:00 committed by Pierre Boutillier
parent 99c37d5214
commit 634c398a70
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib_stdlib/logging.ml
View File

@ -37,7 +37,7 @@ type log_section = ..
type log_message = { type log_message = {
section : log_section ; section : log_section ;
level : level ; level : level ;
text : string ; text : string option ;
tags : Tag.set ; tags : Tag.set ;
} }
@ -109,13 +109,13 @@ module Make_semantic(S : MESSAGE) : SEMLOG = struct
fun format ?(tags=Tag.empty) -> fun format ?(tags=Tag.empty) ->
Format.kasprintf Format.kasprintf
(fun text -> (fun text ->
call_taps { section = Section ; level ; text ; tags }; call_taps { section = Section ; level ; text = Some text ; tags };
Lwt_log_core.log ~section ~level text) Lwt_log_core.log ~section ~level text)
format format
else else
fun format ?(tags=Tag.empty) -> fun format ?(tags=Tag.empty) ->
Format.ikfprintf Format.ikfprintf
(fun _ -> call_taps { section = Section ; level ; text = "" ; tags }; Lwt.return_unit) (fun _ -> call_taps { section = Section ; level ; text = None ; tags }; Lwt.return_unit)
Format.std_formatter Format.std_formatter
format format
@ -124,13 +124,13 @@ module Make_semantic(S : MESSAGE) : SEMLOG = struct
fun format ?(tags=Tag.empty) -> fun format ?(tags=Tag.empty) ->
Format.kasprintf Format.kasprintf
(fun text -> (fun text ->
call_taps { section = Section ; level ; text ; tags }; call_taps { section = Section ; level ; text = Some text ; tags };
Lwt_log_core.ign_log ~section ~level text) Lwt_log_core.ign_log ~section ~level text)
format format
else else
fun format ?(tags=Tag.empty) -> fun format ?(tags=Tag.empty) ->
Format.ikfprintf Format.ikfprintf
(fun _ -> call_taps { section = Section ; level ; text = "" ; tags }) (fun _ -> call_taps { section = Section ; level ; text = None ; tags })
Format.std_formatter Format.std_formatter
format format
@ -187,7 +187,7 @@ module Make_unregistered(S : sig val name: string end) : LOG = struct
else else
Format.kasprintf Format.kasprintf
(fun msg -> (fun msg ->
call_taps { section = Section ; level ; text = msg ; tags = Tag.empty }; call_taps { section = Section ; level ; text = Some msg ; tags = Tag.empty };
Lwt_log_core.log ?exn ~section ?location ?logger ~level msg) Lwt_log_core.log ?exn ~section ?location ?logger ~level msg)
format format
@ -198,7 +198,7 @@ module Make_unregistered(S : sig val name: string end) : LOG = struct
else else
Format.kasprintf Format.kasprintf
(fun msg -> (fun msg ->
call_taps { section = Section ; level ; text = msg ; tags = Tag.empty }; call_taps { section = Section ; level ; text = Some msg ; tags = Tag.empty };
Lwt_log_core.ign_log ?exn ~section ?location ?logger ~level msg) Lwt_log_core.ign_log ?exn ~section ?location ?logger ~level msg)
format format

2
src/lib_stdlib/logging.mli
View File

@ -30,7 +30,7 @@ type log_section = private ..
type log_message = { type log_message = {
section : log_section ; section : log_section ;
level : level ; level : level ;
text : string ; text : string option ;
tags : Tag.set ; tags : Tag.set ;
} }