Add settings.log.recode and settings.log.recode.encoding. Fixes: #3231

src/core/configure.ml

@@ -1,5 +1,3 @@
-let add_subst = Utils.add_subst
-
 open Liquidsoap_lang
 include Build_config
 include Liquidsoap_paths
@@ -27,11 +25,6 @@ let libs_versions () =
          if version = "?" then name else name ^ "=" ^ version)
   |> String.concat " "
 
-let () =
-  Lifecycle.before_init (fun () ->
-      add_subst "<sysrundir>" (rundir ());
-      add_subst "<syslogdir>" (logdir ()))
-
 let restart = ref false
 
 let vendor =
@@ -48,30 +41,6 @@ let conf_init =
   conf#plug "init" Dtools.Init.conf;
   Dtools.Init.conf
 
-let conf_console =
-  Dtools.Conf.void ~p:(conf#plug "console") "Console configuration"
-
-let conf_colorize =
-  Dtools.Conf.string
-    ~p:(conf_console#plug "colorize")
-    ~d:
-      (match !Console.color_conf with
-        | `Auto -> "auto"
-        | `Always -> "always"
-        | `Never -> "never")
-    "Use color in console output when available. One of: \"always\", \"never\" \
-     or \"auto\"."
-
-let () =
-  let log = Log.make ["console"] in
-  conf_colorize#on_change (function
-    | "auto" -> Console.color_conf := `Auto
-    | "always" -> Console.color_conf := `Always
-    | "never" -> Console.color_conf := `Never
-    | _ ->
-        log#important "Invalid color configuration, using default \"auto\"";
-        Console.color_conf := `Auto)
-
 let conf_debug =
   Dtools.Conf.bool ~p:(conf#plug "debug") ~d:!Term.conf_debug
     "Debug language features such as type inference and reduction."

src/core/dune

@@ -61,6 +61,7 @@
   avi_format
   biquad_filter
   blank
+  charset_base
   charset
   child_support
   chord

src/core/tools/charset.ml

@@ -20,50 +20,9 @@
 
   *****************************************************************************)
 
-let conf_camomile =
-  Dtools.Conf.void
-    ~p:(Configure.conf#plug "camomile")
-    "Settings related to camomile library (for charset conversion)."
+include Charset_base
 
-let conf_path =
-  Dtools.Conf.string
-    ~p:(conf_camomile#plug "path")
-    ~d:(Liquidsoap_paths.camomile_dir ())
-    "Directory where camomile files are to be found."
-
-let conf_encoding =
-  Dtools.Conf.list
-    ~p:(conf_camomile#plug "encodings")
-    ~d:["UTF-8"; "ISO-8859-1"; "UTF-16"]
-    "List of encodings to try for automatic encoding detection."
-
-module C = CamomileLib.CharEncoding.Configure (struct
-  let basedir = conf_path#get
-  let datadir = Filename.concat basedir "database"
-  let localedir = Filename.concat basedir "locales"
-  let charmapdir = Filename.concat basedir "charmaps"
-  let unimapdir = Filename.concat basedir "mappings"
-end)
-
-include C
-
-exception Unknown_encoding of string
-exception Unsupported_encoding of t
-
-let of_string s = try C.of_name s with Not_found -> raise (Unknown_encoding s)
-let to_string = C.name_of
-let custom_encoding = ref None
-
-let automatic_encoding () =
-  match !custom_encoding with
-    | Some e -> e
-    | None ->
-        let encs = conf_encoding#get in
-        let e = C.automatic "auto" (List.map of_string encs) C.utf8 in
-        custom_encoding := Some e;
-        e
-
-let log = Log.make ["camomile"]
+let log = Log.make ["charset"]
 
 let recode_string ~fail ~in_enc ~out_enc s =
   try

src/core/tools/charset_base.ml

@@ -0,0 +1,63 @@
+(*****************************************************************************
+
+    Liquidsoap, a programmable audio stream generator.
+    Copyright 2003-2023 Savonet team
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details, fully stated in the COPYING
+    file at the root of the liquidsoap distribution.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+  *****************************************************************************)
+
+let conf_charset =
+  Dtools.Conf.void
+    ~p:(Configure.conf#plug "charset")
+    "Settings related to charset conversion."
+
+let conf_path =
+  Dtools.Conf.string ~p:(conf_charset#plug "path")
+    ~d:(Liquidsoap_paths.camomile_dir ())
+    "Directory where charset files are to be found."
+
+let conf_encoding =
+  Dtools.Conf.list
+    ~p:(conf_charset#plug "encodings")
+    ~d:["UTF-8"; "ISO-8859-1"; "UTF-16"]
+    "List of encodings to try for automatic encoding detection."
+
+module C = CamomileLib.CharEncoding.Configure (struct
+  let basedir = conf_path#get
+  let datadir = Filename.concat basedir "database"
+  let localedir = Filename.concat basedir "locales"
+  let charmapdir = Filename.concat basedir "charmaps"
+  let unimapdir = Filename.concat basedir "mappings"
+end)
+
+include C
+
+exception Unknown_encoding of string
+exception Unsupported_encoding of t
+
+let of_string s = try C.of_name s with Not_found -> raise (Unknown_encoding s)
+let to_string = C.name_of
+let custom_encoding = ref None
+
+let automatic_encoding () =
+  match !custom_encoding with
+    | Some e -> e
+    | None ->
+        let encs = conf_encoding#get in
+        let e = C.automatic "auto" (List.map of_string encs) C.utf8 in
+        custom_encoding := Some e;
+        e

src/core/tools/log.ml

@@ -22,6 +22,20 @@
 
 (** Logging functions. *)
 
+let conf_recode =
+  Dtools.Conf.bool
+    ~p:(Dtools.Log.conf#plug "recode")
+    ~d:false
+    "Recode log entries. Source encoding is set using \
+     `settings.charset.encodings`."
+
+let conf_encoding =
+  Dtools.Conf.string
+    ~p:(conf_recode#plug "encoding")
+    ~d:"UTF-8" "Encoding to recode log entries to."
+
+let recode = ref (fun s -> s)
+
 type t =
   < active : int -> bool
   ; f : 'a. int -> ('a, unit, string, unit) format4 -> 'a
@@ -35,11 +49,12 @@ type t =
 
 let make path : t =
   let colorize colors { Dtools.Log.time; label; level; log } =
+    let recode = !recode in
     {
       Dtools.Log.time;
-      label = Option.map (Console.colorize [`green]) label;
+      label = Option.map (fun s -> Console.colorize [`green] (recode s)) label;
       level;
-      log = Console.colorize colors log;
+      log = Console.colorize colors (recode log);
     }
   in
   let log = Dtools.Log.make path in
@@ -85,3 +100,48 @@ let make path : t =
     method set_level lvl =
       (Dtools.Conf.as_int (Dtools.Log.conf_level#ut#path log#path))#set lvl
   end
+
+let () =
+  let log = make ["log"] in
+  let set_recode () =
+    recode :=
+      match Charset_base.of_string conf_encoding#get with
+        | out_enc -> (
+            fun s ->
+              let in_enc = Charset_base.automatic_encoding () in
+              try Charset_base.recode_string ~in_enc ~out_enc s
+              with exn ->
+                log#important "Failed to convert %S: unknown error %s" s
+                  (Printexc.to_string exn);
+                s)
+        | exception _ ->
+            log#severe "Invalid target encoding for log conversion: %s"
+              conf_encoding#get;
+            fun s -> s
+  in
+  conf_recode#on_change (fun recode -> if recode then set_recode ());
+  conf_encoding#on_change (fun _ -> if conf_recode#get then set_recode ())
+
+let conf_console =
+  Dtools.Conf.void ~p:(Configure.conf#plug "console") "Console configuration"
+
+let conf_colorize =
+  Dtools.Conf.string
+    ~p:(conf_console#plug "colorize")
+    ~d:
+      (match !Console.color_conf with
+        | `Auto -> "auto"
+        | `Always -> "always"
+        | `Never -> "never")
+    "Use color in console output when available. One of: \"always\", \"never\" \
+     or \"auto\"."
+
+let () =
+  let log = make ["console"] in
+  conf_colorize#on_change (function
+    | "auto" -> Console.color_conf := `Auto
+    | "always" -> Console.color_conf := `Always
+    | "never" -> Console.color_conf := `Never
+    | _ ->
+        log#important "Invalid color configuration, using default \"auto\"";
+        Console.color_conf := `Auto)

src/runtime/main.ml

@@ -456,6 +456,9 @@ let () =
       Dtools.Init.conf_daemon_pidfile_path#set_d
         (Some "<sysrundir>/<script>.pid");
 
+      Utils.add_subst "<sysrundir>" (Liquidsoap_paths.rundir ());
+      Utils.add_subst "<syslogdir>" (Liquidsoap_paths.logdir ());
+
       log#important "Liquidsoap %s" Configure.version;
       log#important "Using: %s" (Configure.libs_versions ());
       if Configure.git_snapshot then