diff --git a/src/lib_base/unix/internal_event_unix.ml b/src/lib_base/unix/internal_event_unix.ml index 238a7066e8bfe297d2b5306a57852292e8e9aa1d..ed11ca7e06bd6f93f759e0f2bd7468d065ec164a 100644 --- a/src/lib_base/unix/internal_event_unix.ml +++ b/src/lib_base/unix/internal_event_unix.ml @@ -117,16 +117,18 @@ let close () = open Filename.Infix -let default_daily_logs_at ~daily_logs_path = +let default_daily_logs_at ~daily_logs_path ~section_prefixes = Internal_event_config.make_config_uri ~create_dirs:true ~daily_logs:7 ~level:Info ~format:"pp-rfc5424" + ~section_prefixes (`Path (daily_logs_path // "daily.log")) let make_default_internal_events ~rules ~verbosity ~colors - ~(log_output : Logs_simple_config.Output.t) ~daily_logs_path = + ~(log_output : Logs_simple_config.Output.t) ~daily_logs_path + ~daily_logs_section_prefixes = (* By default the node has two logs output: - on the configured [log_output] using the configured [verbosity] and a short pretty printing @@ -164,13 +166,18 @@ let make_default_internal_events ~rules ~verbosity ~colors let sinks = match daily_logs_path with | Some daily_logs_path -> - let internal_logs_events = default_daily_logs_at ~daily_logs_path in + let internal_logs_events = + default_daily_logs_at + ~section_prefixes:daily_logs_section_prefixes + ~daily_logs_path + in internal_logs_events :: sinks | None -> sinks in Internal_event_config.make_custom sinks let make_with_defaults ?verbosity ?enable_default_daily_logs_at + ?(daily_logs_section_prefixes = []) ?(log_cfg = Logs_simple_config.default_cfg) () = make_default_internal_events ~rules:log_cfg.rules @@ -178,6 +185,7 @@ let make_with_defaults ?verbosity ?enable_default_daily_logs_at ~colors:log_cfg.colors ~log_output:log_cfg.output ~daily_logs_path:enable_default_daily_logs_at + ~daily_logs_section_prefixes let init ?config:(internal_events = make_with_defaults ()) () = let open Lwt_syntax in @@ -185,5 +193,5 @@ let init ?config:(internal_events = make_with_defaults ()) () = return_unit let enable_default_daily_logs_at ~daily_logs_path = - let uri = default_daily_logs_at ~daily_logs_path in + let uri = default_daily_logs_at ~section_prefixes:[] ~daily_logs_path in Internal_event.All_sinks.activate uri diff --git a/src/lib_base/unix/internal_event_unix.mli b/src/lib_base/unix/internal_event_unix.mli index 0162cb140e1ab09609c4e22c2e5c6ab40500cfb3..35c39d122dc80fe931d2d538c42b9ac2060838c9 100644 --- a/src/lib_base/unix/internal_event_unix.mli +++ b/src/lib_base/unix/internal_event_unix.mli @@ -47,9 +47,9 @@ val env_var_name : string (** Call [close] on all the sinks. *) val close : unit -> unit Lwt.t -(** [make_defaults ?verbosity ?enable_default_daily_logs_at ?internal_events] - creates internal event configuration using default values depending on - parameters. +(** [make_defaults ?verbosity ?enable_default_daily_logs_at + ?daily_logs_section_prefixes ?internal_events] creates internal + event configuration using default values depending on parameters. - [verbosity] overrides the default level on stdout. Usually provided through -v instead of configuration. @@ -63,11 +63,12 @@ val close : unit -> unit Lwt.t ?create-dirs=true&daily-logs=7§ion-prefix=info&format=pp"] This function handles [TEZOS_LOG] environment variables and rules - provided through it. + provided through it. It also optionally accepts [?daily_logs_section_prefixes]. *) val make_with_defaults : ?verbosity:Internal_event.level -> ?enable_default_daily_logs_at:string -> + ?daily_logs_section_prefixes:(string * Internal_event.level) list -> ?log_cfg:Logs_simple_config.cfg -> unit -> Internal_event_config.t