robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

console_of_string: be a bit more robust

Browse source 
If a line somehow has an unexpected shape we log a warning and omit it.
This commit is contained in:
Reynir Björnsson 2025-01-15 13:43:18 +01:00
parent 3c7c21afcd
commit b2f153396b
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/builder_db_app.ml
View file

@ -761,22 +761,20 @@ end
(* NOTE: this function is duplicatedi in lib/model.ml *) (* NOTE: this function is duplicatedi in lib/model.ml *)
let console_of_string data = let console_of_string data =
(* remove last empty line *)
let data =
if String.ends_with ~suffix:"\n" data then
String.sub data 0 (String.length data - 2)
else data
in
let lines = String.split_on_char '\n' data in let lines = String.split_on_char '\n' data in
List.map (fun line -> List.filter_map (fun line ->
match String.index line ':' with match String.index line ':' with
| 0 -> Logs.warn (fun m -> m "console line starting with colon %S" line); None
| i -> | i ->
(* the timestamp is of the form "%fs", e.g. 0.867s; so chop off the 's' *) (* the timestamp is of the form "%fs", e.g. 0.867s; so chop off the 's' *)
let delta = float_of_string (String.sub line 0 (i - 1)) in let delta = float_of_string (String.sub line 0 (i - 1)) in
let delta = Int64.to_int (Duration.of_f delta) in let delta = Int64.to_int (Duration.of_f delta) in
let line = String.sub line i (String.length line - i) in let line = String.sub line i (String.length line - i) in
delta, line Some (delta, line)
| exception Not_found -> assert false) | exception Not_found ->
if line <> "" then
Logs.warn (fun m -> m "Unexpected console line %S" line);
None)
lines lines
let extract_full () datadir dest uuid = let extract_full () datadir dest uuid =

16
lib/model.ml
View file

@ -526,22 +526,20 @@ let add_build
(* NOTE: this function is duplicatedi in bin/builder_db_app.ml *) (* NOTE: this function is duplicatedi in bin/builder_db_app.ml *)
let console_of_string data = let console_of_string data =
(* remove last empty line *)
let data =
if String.ends_with ~suffix:"\n" data then
String.sub data 0 (String.length data - 2)
else data
in
let lines = String.split_on_char '\n' data in let lines = String.split_on_char '\n' data in
List.map (fun line -> List.filter_map (fun line ->
match String.index line ':' with match String.index line ':' with
| 0 -> Log.warn (fun m -> m "console line starting with colon %S" line); None
| i -> | i ->
(* the timestamp is of the form "%fs", e.g. 0.867s; so chop off the 's' *) (* the timestamp is of the form "%fs", e.g. 0.867s; so chop off the 's' *)
let delta = float_of_string (String.sub line 0 (i - 1)) in let delta = float_of_string (String.sub line 0 (i - 1)) in
let delta = Int64.to_int (Duration.of_f delta) in let delta = Int64.to_int (Duration.of_f delta) in
let line = String.sub line i (String.length line - i) in let line = String.sub line i (String.length line - i) in
delta, line Some (delta, line)
| exception Not_found -> assert false) | exception Not_found ->
if line <> "" then
Log.warn (fun m -> m "Unexpected console line %S" line);
None)
lines lines
let exec_of_build datadir uuid (module Db : CONN) = let exec_of_build datadir uuid (module Db : CONN) =