gi_test/gi: fix logger not being initialized on DocTest flush

pablode · Aug 4, 2024 · cadad8c · cadad8c
1 parent 6d62706
commit cadad8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/gb/impl/Log.cpp b/src/gb/impl/Log.cpp
@@ -29,7 +29,10 @@ namespace gtl
 
   void gbLogInit()
   {
-    assert(!s_logger);
+    if (s_logger)
+    {
+      return;
+    }
 
     quill::ConsoleColours consoleColors;
     consoleColors.set_default_colours();

diff --git a/src/gi/impl/Gi.cpp b/src/gi/impl/Gi.cpp
@@ -184,7 +184,6 @@ namespace gtl
   };
 
   bool s_cgpuInitialized = false;
-  bool s_loggerInitialized = false;
   CgpuDevice s_device;
   CgpuPhysicalDeviceFeatures s_deviceFeatures;
   CgpuPhysicalDeviceProperties s_deviceProperties;
@@ -326,11 +325,7 @@ namespace gtl
       return GiStatus::Error;
     }
 
-    if (!s_loggerInitialized)
-    {
-      gbLogInit();
-      s_loggerInitialized = true;
-    }
+    gbLogInit();
 
     _PrintInitInfo(params);
 

diff --git a/src/gt/impl/LogFlushListener.cpp b/src/gt/impl/LogFlushListener.cpp
@@ -25,7 +25,7 @@ namespace gtl
 {
   // Unfortunately is it not enough to only hook report_query() or log_message().
 
-  GtLogFlushListener::GtLogFlushListener(const ContextOptions&) {}
+  GtLogFlushListener::GtLogFlushListener(const ContextOptions&) { gbLogInit(); }
 
   void GtLogFlushListener::report_query(const QueryData&) { gbLogFlush(); }