Make more modifications to logging

1 files changed, 8 insertions, 4 deletions

diff --git a/src/Logging.ml b/src/Logging.ml
index 2759854c..36ede236 100644
--- a/src/Logging.ml
+++ b/src/Logging.ml
@@ -4,7 +4,7 @@ module L = Easy_logging.Logging
 let _ = L.make_logger "MainLogger" Debug [ Cli Debug ]
 
 (** The main logger *)
-let log = L.get_logger "MainLogger"
+let main_log = L.get_logger "MainLogger"
 
 (** Below, we create subgloggers for various submodules, so that we can precisely
     toggle logging on/off, depending on which information we need *)
@@ -18,6 +18,9 @@ let statements_log = L.get_logger "MainLogger.Interpreter.Statements"
 (** Logger for InterpreterExpressions *)
 let expressions_log = L.get_logger "MainLogger.Interpreter.Expressions"
 
+(** Logger for InterpreterPaths *)
+let paths_log = L.get_logger "MainLogger.Interpreter.Paths"
+
 (** Logger for InterpreterExpansion *)
 let expansion_log = L.get_logger "MainLogger.Interpreter.Expansion"
 
@@ -131,7 +134,7 @@ let format_tags (tags : string list) =
       "[" ^ elems_str ^ "] "
 
 (* Change the formatters *)
-let _ =
+let main_logger_handler =
   (* TODO: comes from easy_logging *)
   let formatter (item : L.log_item) : string =
     let item_level_fmt =
@@ -147,5 +150,6 @@ let _ =
       item_msg_fmt
   in
   (* There should be exactly one handler *)
-  let handlers = log#get_handlers in
-  List.map (fun h -> H.set_formatter h formatter) handlers
+  let handlers = main_log#get_handlers in
+  List.iter (fun h -> H.set_formatter h formatter) handlers;
+  match handlers with [ handler ] -> handler | _ -> failwith "Unexpected"