diff --git a/etherlink/CHANGES_NODE.md b/etherlink/CHANGES_NODE.md index 401a913941888feea13dff00d16a06d7cfa9b65a..3fb9414c40eac2bd9c0726c1ed78c03ac3a0df86 100644 --- a/etherlink/CHANGES_NODE.md +++ b/etherlink/CHANGES_NODE.md @@ -33,6 +33,13 @@ you start using them, you probably want to use `octez-evm-node check config - The event for the rpc mode when forwarding transaction was incorrectly named "forwarding_error`. It's now renamed "forward_transaction".(!17910) +- The daily logs of the experimental RPC node are written in a + different directory prefixed by "rpc-", and not in the same + log directory as the main node. Since V0.23 the daily log of the rpc + node was written in the same directory, because how dailylogs works + the log of the main node "dailylog-.log" were deleted. If you + used an rpc EVM node v0.22 or later, please delete files prefixed + with "rpc--" from "/dailylogs/". (!17923) ## Version 0.24 (2025-04-30) diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml index cd7ddf218539b0f1a3266de986de3e492062fb23..8ef6a2ca2f410ba2e0d7a89ee371ae65bd5d6b9e 100644 --- a/etherlink/bin_node/main.ml +++ b/etherlink/bin_node/main.ml @@ -889,7 +889,7 @@ let websocket_checks config = Internal_event.Simple.emit Event.buggy_dream_websocket () |> Lwt_result.ok | _ -> Lwt_result_syntax.return_unit -let make_event_config ~verbosity ?daily_logs_path ?daily_log_basename () = +let make_event_config ~verbosity ?daily_logs_path () = let open Tezos_event_logging.Internal_event in let open Tezos_base_unix.Internal_event_unix in let open Tezos_base.Internal_event_config in @@ -911,9 +911,7 @@ let make_event_config ~verbosity ?daily_logs_path ?daily_log_basename () = ("rpc_server", Some Fatal); ] in - let daily_log_file = - Option.value ~default:"daily" daily_log_basename ^ ".log" - in + let daily_log_file = "daily.log" in let uri = make_config_uri ~create_dirs:true @@ -931,19 +929,17 @@ let make_event_config ~verbosity ?daily_logs_path ?daily_log_basename () = let init_logs ~daily_logs ?rpc_mode_port ~data_dir configuration = let open Tezos_base_unix.Internal_event_unix in let daily_logs_path = - if daily_logs then Some Filename.Infix.(data_dir // "daily_logs") else None - in - let daily_log_basename = - Option.map - (fun port -> "rpc-" ^ string_of_int port ^ "-daily") - rpc_mode_port + if daily_logs then + match rpc_mode_port with + | Some port -> + Some + Filename.Infix.( + data_dir // ("daily_logs_rpc_" ^ string_of_int port)) + | None -> Some Filename.Infix.(data_dir // "daily_logs") + else None in let config = - make_event_config - ~verbosity:configuration.verbose - ?daily_logs_path - ?daily_log_basename - () + make_event_config ~verbosity:configuration.verbose ?daily_logs_path () in init ~config ()