Skip to content

Commit 510f485

Browse files
bobzhangbobzhang
committed
add a poor man logger so that bsb output can be controlled
1 parent 75a8f13 commit 510f485

14 files changed

+130
-163
lines changed

‎jscomp/all.depend

+18-17
Original file line numberDiff line numberDiff line change
@@ -782,18 +782,19 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
782782
ounit_tests/ounit_cmd_tests.cmx ounit_tests/ounit_bsb_regex_tests.cmx \
783783
ounit_tests/ounit_bal_tree_tests.cmx ounit_tests/ounit_array_tests.cmx \
784784
ounit/oUnit.cmx ounit_tests/ounit_tests_main.cmi
785-
bsb/bsb_bsdeps.cmx : common/bs_version.cmx bsb/bsb_bsdeps.cmi
785+
bsb/bsb_bsdeps.cmx : bsb/bsb_log.cmx common/bs_version.cmx \
786+
bsb/bsb_bsdeps.cmi
786787
bsb/bsb_build_cache.cmx : ext/string_map.cmx ext/ext_string.cmx \
787788
ext/ext_pervasives.cmx ext/ext_path.cmx ext/ext_modulename.cmx \
788789
bsb/bsb_build_cache.cmi
789790
bsb/bsb_build_schemas.cmx :
790791
bsb/bsb_build_util.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
791792
ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx ext/ext_path.cmx \
792793
ext/ext_list.cmx ext/ext_json_types.cmx ext/ext_json_parse.cmx \
793-
ext/ext_json.cmx ext/ext_array.cmx bsb/bsb_pkg.cmx bsb/bsb_exception.cmx \
794-
bsb/bsb_build_schemas.cmx bsb/bsb_build_util.cmi
795-
bsb/bsb_clean.cmx : ext/ext_path.cmx bsb/bsb_unix.cmx bsb/bsb_config.cmx \
796-
bsb/bsb_build_util.cmx bsb/bsb_clean.cmi
794+
ext/ext_json.cmx ext/ext_array.cmx bsb/bsb_pkg.cmx bsb/bsb_log.cmx \
795+
bsb/bsb_exception.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_util.cmi
796+
bsb/bsb_clean.cmx : ext/ext_path.cmx bsb/bsb_unix.cmx bsb/bsb_log.cmx \
797+
bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_clean.cmi
797798
bsb/bsb_config.cmx : ext/ext_path.cmx bsb/bsb_config.cmi
798799
bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
799800
ext/literals.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
@@ -814,7 +815,7 @@ bsb/bsb_exception.cmx : ext/ext_string.cmx ext/ext_position.cmx \
814815
ext/ext_json.cmx common/bs_version.cmx bsb/bsb_exception.cmi
815816
bsb/bsb_file.cmx : bsb/bsb_file.cmi
816817
bsb/bsb_helper_dep_graph.cmx : ext/string_set.cmx ext/string_map.cmx \
817-
ext/string_hashtbl.cmx bsb/bsb_helper_dep_graph.cmi
818+
ext/string_hashtbl.cmx bsb/bsb_log.cmx bsb/bsb_helper_dep_graph.cmi
818819
bsb/bsb_helper_extract.cmx : ext/string_set.cmx ext/ext_string.cmx \
819820
bsb/bsb_helper_extract.cmi
820821
bsb/bsb_helper_linker.cmx : ext/string_map.cmx ext/literals.cmx \
@@ -852,12 +853,11 @@ bsb/bsb_ninja_gen.cmx : ext/string_map.cmx ext/literals.cmx \
852853
bsb/bsb_ninja_gen.cmi
853854
bsb/bsb_ninja_global_vars.cmx :
854855
bsb/bsb_ninja_regen.cmx : ext/literals.cmx ext/ext_path.cmx \
855-
bsb/bsb_ninja_gen.cmx bsb/bsb_merlin_gen.cmx bsb/bsb_config_parse.cmx \
856-
bsb/bsb_config.cmx bsb/bsb_clean.cmx bsb/bsb_build_util.cmx \
857-
bsb/bsb_bsdeps.cmx bsb/bsb_ninja_regen.cmi
856+
bsb/bsb_ninja_gen.cmx bsb/bsb_merlin_gen.cmx bsb/bsb_log.cmx \
857+
bsb/bsb_config_parse.cmx bsb/bsb_config.cmx bsb/bsb_clean.cmx \
858+
bsb/bsb_build_util.cmx bsb/bsb_bsdeps.cmx bsb/bsb_ninja_regen.cmi
858859
bsb/bsb_ninja_util.cmx : ext/ext_string.cmx bsb/bsb_rule.cmx \
859860
bsb/bsb_ninja_util.cmi
860-
bsb/bsb_os_dependent.cmx :
861861
bsb/bsb_package_specs.cmx : ext/string_map.cmx ext/literals.cmx \
862862
ext/ext_string.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
863863
ext/ext_json_types.cmx ext/ext_json.cmx bsb/bsb_exception.cmx \
@@ -866,10 +866,10 @@ bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
866866
ext/string_map.cmx ext/string_hashtbl.cmx ext/ext_string.cmx \
867867
ext/ext_path.cmx ext/ext_json_types.cmx ext/ext_json.cmx \
868868
ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
869-
bsb/bsb_exception.cmx bsb/bsb_dir_index.cmx bsb/bsb_build_util.cmx \
870-
bsb/bsb_build_schemas.cmx bsb/bsb_build_cache.cmx \
869+
bsb/bsb_log.cmx bsb/bsb_exception.cmx bsb/bsb_dir_index.cmx \
870+
bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_cache.cmx \
871871
bsb/bsb_parse_sources.cmi
872-
bsb/bsb_pkg.cmx : ext/string_hashtbl.cmx ext/literals.cmx \
872+
bsb/bsb_pkg.cmx : ext/string_hashtbl.cmx ext/literals.cmx bsb/bsb_log.cmx \
873873
bsb/bsb_exception.cmx bsb/bsb_pkg.cmi
874874
bsb/bsb_pkg_cmi_create.cmx :
875875
bsb/bsb_pkg_map_gen.cmx : ext/string_map.cmx ext/literals.cmx \
@@ -884,15 +884,16 @@ bsb/bsb_templates.cmx : bsb/oCamlRes.cmx bsb/bsb_templates.cmi
884884
bsb/bsb_theme_init.cmx : ext/string_hashtbl.cmx bsb/oCamlRes.cmx \
885885
ext/ext_string.cmx ext/ext_io.cmx bsb/bsb_templates.cmx bsb/bsb_regex.cmx \
886886
common/bs_version.cmx bsb/bsb_theme_init.cmi
887-
bsb/bsb_unix.cmx : ext/ext_sys.cmx ext/ext_string.cmx bsb/bsb_unix.cmi
887+
bsb/bsb_unix.cmx : ext/ext_sys.cmx ext/ext_string.cmx bsb/bsb_log.cmx \
888+
bsb/bsb_unix.cmi
888889
bsb/bsb_watcher_gen.cmx : ext/ext_path.cmx ext/ext_list.cmx \
889890
ext/ext_json_noloc.cmx ext/ext_array.cmx bsb/bsb_parse_sources.cmx \
890891
bsb/bsb_config.cmx bsb/bsb_watcher_gen.cmi
891892
bsb/bsb_world.cmx : ext/string_hash_set.cmx ext/literals.cmx \
892893
ext/ext_path.cmx ext/ext_namespace.cmx bsb/bsb_unix.cmx \
893-
bsb/bsb_ninja_regen.cmx bsb/bsb_file.cmx bsb/bsb_config_types.cmx \
894-
bsb/bsb_config_parse.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
895-
bsb/bsb_world.cmi
894+
bsb/bsb_ninja_regen.cmx bsb/bsb_log.cmx bsb/bsb_file.cmx \
895+
bsb/bsb_config_types.cmx bsb/bsb_config_parse.cmx bsb/bsb_config.cmx \
896+
bsb/bsb_build_util.cmx bsb/bsb_world.cmi
896897
bsb/oCamlRes.cmx :
897898
bsb/bsb_bsdeps.cmi :
898899
bsb/bsb_build_cache.cmi : ext/string_map.cmi

‎jscomp/bsb/bsb_bsdeps.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ let check ~cwd ~forced ~file =
112112
check_aux cwd xs 0 (Array.length xs)
113113
with e ->
114114
begin
115-
Format.fprintf
116-
Format.std_formatter
115+
Bsb_log.info
117116
"@{<info>Stat miss %s@}@."
118117
(Printexc.to_string e);
119118
Bsb_file_not_exist

‎jscomp/bsb/bsb_build_util.ml

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ let resolve_bsb_magic_file ~cwd ~desc p =
7878
if Sys.file_exists path then path
7979
else
8080
begin
81-
Format.fprintf Format.err_formatter "@{<error>Could not resolve @} %s in %s" p cwd ;
81+
Bsb_log.error "@{<error>Could not resolve @} %s in %s@." p cwd ;
8282
failwith (p ^ " not found when resolving " ^ desc)
8383
end
8484

@@ -179,16 +179,16 @@ let rec walk_all_deps_aux visited paths top dir cb =
179179
in
180180
let package_stacks = cur_package_name :: paths in
181181
let () =
182-
Format.fprintf Format.std_formatter "@{<info>Package stack:@} %a @." pp_packages_rev
182+
Bsb_log.info "@{<info>Package stack:@} %a @." pp_packages_rev
183183
package_stacks
184184
in
185185
if List.mem cur_package_name paths then
186186
begin
187-
Format.fprintf Format.err_formatter "@{<error>Cyclc dependencies in package stack@}@.";
187+
Bsb_log.error "@{<error>Cyclc dependencies in package stack@}@.";
188188
exit 2
189189
end;
190190
if String_hashtbl.mem visited cur_package_name then
191-
Format.fprintf Format.std_formatter
191+
Bsb_log.info
192192
"@{<info>Visited before@} %s@." cur_package_name
193193
else
194194
begin

‎jscomp/bsb/bsb_clean.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ let ninja_clean bsc_dir proj_dir =
3333
if Sys.file_exists cwd then
3434
Bsb_unix.run_command_execv { cmd ; args = [|cmd; "-t"; "clean"|] ; cwd };
3535
with e ->
36-
Format.fprintf Format.err_formatter "@{<info>ninja clean failed : %s @." (Printexc.to_string e)
36+
Bsb_log.warn "@{<warning>ninja clean failed : %s @." (Printexc.to_string e)
3737

3838
let clean_bs_garbage bsc_dir proj_dir =
39-
Format.fprintf Format.std_formatter "@{<info>Cleaning:@} in %s@." proj_dir ;
39+
Bsb_log.info "@{<info>Cleaning:@} in %s@." proj_dir ;
4040
let aux x =
4141
let x = (proj_dir // x) in
4242
if Sys.file_exists x then
@@ -46,7 +46,7 @@ let clean_bs_garbage bsc_dir proj_dir =
4646
List.iter aux Bsb_config.all_lib_artifacts;
4747
with
4848
e ->
49-
Format.fprintf Format.err_formatter "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
49+
Bsb_log.warn "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
5050

5151

5252
let clean_bs_deps bsc_dir proj_dir =

‎jscomp/bsb/bsb_helper_dep_graph.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let sort_files_by_dependencies ~domain dependency_graph =
3232
let result = Queue.create () in
3333
let rec visit visiting path current =
3434
if String_set.mem current visiting then
35-
Format.fprintf Format.err_formatter "Cyclic depends : @[%a@]"
35+
Bsb_log.error "@{<error>Cyclic depends@} : @[%a@]"
3636
(Format.pp_print_list ~pp_sep:Format.pp_print_space
3737
Format.pp_print_string)
3838
(current::path)
@@ -73,7 +73,7 @@ let simple_collect_from_main ?alias_map ast_table main_module =
7373
in
7474
let rec visit visiting path current =
7575
if String_set.mem current visiting then
76-
Format.fprintf Format.err_formatter "Cyclic depends : @[%a@]"
76+
Bsb_log.error "@{<error>Cyclic depends@} : @[%a@]"
7777
(Format.pp_print_list ~pp_sep:Format.pp_print_space
7878
Format.pp_print_string)
7979
(current::path)

‎jscomp/bsb/bsb_log.ml

+58-10
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,77 @@
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2424

2525
let color_enabled = ref (Unix.isatty Unix.stdin)
26+
27+
let color_functions : Format.formatter_tag_functions = {
28+
mark_open_tag = (fun s -> if !color_enabled then Ext_color.ansi_of_tag s else Ext_string.empty) ;
29+
mark_close_tag = (fun _ -> if !color_enabled then Ext_color.reset_lit else Ext_string.empty);
30+
print_open_tag = (fun _ -> ());
31+
print_close_tag = (fun _ -> ())
32+
}
33+
2634
let set_color ppf =
27-
Format.pp_set_formatter_tag_functions ppf
28-
({ (Format.pp_get_formatter_tag_functions ppf () ) with
29-
mark_open_tag = (fun s -> if !color_enabled then Ext_color.ansi_of_tag s else Ext_string.empty) ;
30-
mark_close_tag = (fun _ -> if !color_enabled then Ext_color.reset_lit else Ext_string.empty);
31-
})
35+
Format.pp_set_formatter_tag_functions ppf color_functions
3236

3337

3438
let setup () =
3539
begin
3640
Format.pp_set_mark_tags Format.std_formatter true ;
3741
Format.pp_set_mark_tags Format.err_formatter true;
38-
Format.pp_set_mark_tags Format.str_formatter true;
39-
set_color Format.std_formatter ;
40-
set_color Format.err_formatter;
41-
set_color Format.str_formatter
42+
Format.pp_set_formatter_tag_functions
43+
Format.std_formatter color_functions;
44+
Format.pp_set_formatter_tag_functions
45+
Format.err_formatter color_functions
4246
end
4347

48+
type level =
49+
| Debug
50+
| Info
51+
| Warn
52+
| Error
53+
54+
let int_of_level (x : level) =
55+
match x with
56+
| Debug -> 0
57+
| Info -> 1
58+
| Warn -> 2
59+
| Error -> 3
60+
61+
let log_level = ref Warn
62+
63+
let set_log level =
64+
log_level := level
65+
66+
let fprintf level fmt =
67+
if int_of_level level >= int_of_level !log_level then
68+
Format.fprintf fmt
69+
else Format.ifprintf fmt
70+
71+
type 'a fmt =
72+
Format.formatter -> ('a, Format.formatter, unit) format -> 'a
73+
type 'a log =
74+
('a, Format.formatter, unit) format -> 'a
75+
76+
let debug fmt = fprintf Debug Format.std_formatter fmt
77+
let info fmt = fprintf Info Format.std_formatter fmt
78+
let warn fmt = fprintf Warn Format.err_formatter fmt
79+
let error fmt = fprintf Error Format.err_formatter fmt
80+
4481

82+
let info_args (args : string array) =
83+
if int_of_level Info >= int_of_level !log_level then
84+
begin
85+
for i = 0 to Array.length args - 1 do
86+
Format.pp_print_string Format.std_formatter (Array.unsafe_get args i) ;
87+
Format.pp_print_string Format.std_formatter Ext_string.single_space;
88+
done ;
89+
Format.pp_print_newline Format.std_formatter ()
90+
end
91+
else ()
4592

46-
let print_string_args (args : string array) =
93+
(* let print_string_args (args : string array) =
4794
for i = 0 to Array.length args - 1 do
4895
print_string (Array.unsafe_get args i) ;
4996
print_string Ext_string.single_space;
5097
done ;
5198
print_newline ()
99+
*)

‎jscomp/bsb/bsb_log.mli

+10-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,13 @@ val color_enabled : bool ref
2626

2727
val setup : unit -> unit
2828

29-
val print_string_args : string array -> unit
29+
type 'a fmt = Format.formatter -> ('a, Format.formatter, unit) format -> 'a
30+
31+
type 'a log = ('a, Format.formatter, unit) format -> 'a
32+
33+
val debug : 'a log
34+
val info : 'a log
35+
val warn : 'a log
36+
val error : 'a log
37+
38+
val info_args : string array -> unit

‎jscomp/bsb/bsb_main.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ let bsb_main_flags : (string * Arg.spec * string) list=
8888

8989
(** Invariant: it has to be the last command of [bsb] *)
9090
let exec_command_then_exit command =
91-
Format.fprintf Format.std_formatter "@{<info>CMD:@} %s@." command;
91+
Bsb_log.info "@{<info>CMD:@} %s@." command;
9292
exit (Sys.command command )
9393

9494
(* Execute the underlying ninja build call, then exit (as opposed to keep watching) *)
@@ -111,7 +111,7 @@ let ninja_command_exit vendor_ninja ninja_args =
111111
let args =
112112
if ninja_args_len = 0 then ninja_common_args else
113113
Array.append ninja_common_args ninja_args in
114-
Bsb_log.print_string_args args ;
114+
Bsb_log.info_args args ;
115115
Unix.execvp vendor_ninja args
116116

117117

@@ -135,7 +135,7 @@ let handle_anonymous_arg arg =
135135

136136

137137
let watch_exit () =
138-
print_endline "\nStart Watching now ";
138+
Bsb_log.info "@{<info>Watching@}... @.";
139139
let bsb_watcher =
140140
Bsb_build_util.get_bsc_dir cwd // "bsb_watcher.js" in
141141
if Ext_sys.is_windows_or_cygwin then

‎jscomp/bsb/bsb_ninja_regen.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ let regenerate_ninja
4444
~cwd
4545
~forced ~file:output_deps in
4646
let () =
47-
Format.fprintf Format.std_formatter
47+
Bsb_log.info
4848
"@{<info>BSB check@} build spec : %a @." Bsb_bsdeps.pp_check_result check_result in
4949
begin match check_result with
5050
| Good ->

‎jscomp/bsb/bsb_os_dependent.ml

-84
This file was deleted.

0 commit comments

Comments
 (0)