From 3f9a9c0d662b69cd70e86517e8f661c93ac3d02a Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Wed, 25 Sep 2024 14:51:03 +0200 Subject: [PATCH 1/2] Agnostic_baker: introduce wonderful log colors --- src/bin_agnostic_baker/main_agnostic_baker.ml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bin_agnostic_baker/main_agnostic_baker.ml b/src/bin_agnostic_baker/main_agnostic_baker.ml index 67817d41db49..4fd4be4450ac 100644 --- a/src/bin_agnostic_baker/main_agnostic_baker.ml +++ b/src/bin_agnostic_baker/main_agnostic_baker.ml @@ -48,10 +48,13 @@ module Events = struct let section = ["agnostic-baker"] + let alternative_color = Internal_event.Green + (* Notice *) let starting_baker = declare_2 ~section + ~alternative_color ~level:Notice ~name:"starting_baker" ~msg:"starting baker for protocol {proto} with arguments: {args}" @@ -62,6 +65,7 @@ module Events = struct let baker_running = declare_1 ~section + ~alternative_color ~level:Notice ~name:"baker_running" ~msg:"baker for protocol {proto} is now running" @@ -71,6 +75,7 @@ module Events = struct let starting_daemon = declare_0 ~section + ~alternative_color ~level:Notice ~name:"starting_daemon" ~msg:"starting agnostic daemon" @@ -89,6 +94,7 @@ module Events = struct let waiting_for_active_protocol = declare_0 ~section + ~alternative_color ~level:Notice ~name:"waiting_for_active_protocol" ~msg:"waiting for active protocol" @@ -97,6 +103,7 @@ module Events = struct let period_status = declare_2 ~section + ~alternative_color ~level:Notice ~name:"period_status" ~msg: -- GitLab From 6ac26483f305b9224b9e3495ca5a39e3890972a2 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Wed, 25 Sep 2024 14:51:31 +0200 Subject: [PATCH 2/2] Agnostic_baker: introduce daily logs --- src/bin_agnostic_baker/main_agnostic_baker.ml | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/src/bin_agnostic_baker/main_agnostic_baker.ml b/src/bin_agnostic_baker/main_agnostic_baker.ml index 4fd4be4450ac..0a9658d89c23 100644 --- a/src/bin_agnostic_baker/main_agnostic_baker.ml +++ b/src/bin_agnostic_baker/main_agnostic_baker.ml @@ -115,6 +115,23 @@ end module Parameters = struct let default_node_addr = "http://127.0.0.1:8732" + let default_daily_logs_path = Some "octez-agnostic-baker" + + let log_config ~base_dir = + let base_dir : string = + match base_dir with + | Some p -> p + | None -> Tezos_client_base_unix.Client_config.Cfg_file.default.base_dir + in + let daily_logs_path = + default_daily_logs_path + |> Option.map Filename.Infix.(fun logdir -> base_dir // "logs" // logdir) + in + Tezos_base_unix.Internal_event_unix.make_with_defaults + ?enable_default_daily_logs_at:daily_logs_path + ~log_cfg:Tezos_base_unix.Logs_simple_config.default_cfg + () + type status = Active | Frozen let pp_status fmt status = @@ -432,6 +449,10 @@ module Args = struct let endpoint_short_arg = "-E" + let base_dir_arg = "--base-dir" + + let base_dir_short_arg = "--b" + let help_arg = "--help" let print_help () = @@ -489,6 +510,9 @@ module Args = struct print_help () ; exit 1) + let get_base_dir = + get_arg_value ~arg:base_dir_arg ~short_arg:base_dir_short_arg + let parse_args all_args = let all_args = Array.to_list all_args in (* Specific vesrion case *) @@ -505,15 +529,20 @@ module Args = struct (get_endpoint baker_args) in let binaries_directory = get_binaries_directory agnostic_baker_args in - (endpoint, binaries_directory, baker_args) + let base_dir = get_base_dir baker_args in + (endpoint, base_dir, binaries_directory, baker_args) end let run () = let open Lwt_result_syntax in - let*! () = Tezos_base_unix.Internal_event_unix.init () in - let node_endpoint, binaries_directory, baker_args = + let node_endpoint, base_dir, binaries_directory, baker_args = Args.parse_args Sys.argv in + let*! () = + Tezos_base_unix.Internal_event_unix.init + ~config:(Parameters.log_config ~base_dir) + () + in let* _daemon = Daemon.run ~state: -- GitLab