self protection against flush for the backend worker thread

block until the backend worker thread is spinning on start()
odygrd · May 12, 2020 · 878c98a · 878c98a
1 parent 13d4bd7
commit 878c98a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/quill/include/quill/Quill.h b/quill/include/quill/Quill.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "quill/TweakMe.h"
+
 #include "quill/detail/BackendWorker.h"       // for backend_worker_error_h...
 #include "quill/detail/LogMacros.h"           // for filename_t
 #include "quill/detail/LogManager.h"          // for LogManager

diff --git a/quill/include/quill/QuillError.h b/quill/include/quill/QuillError.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "quill/TweakMe.h"
+
 #include "quill/detail/misc/Macros.h"
 #include <exception>
 #include <string>

diff --git a/quill/include/quill/detail/BackendWorker.h b/quill/include/quill/detail/BackendWorker.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "quill/TweakMe.h"
+
 #include "quill/QuillError.h"                     // for QUILL_CATCH, QUILL...
 #include "quill/detail/BoundedSPSCQueue.h"        // for BoundedSPSCQueue<>...
 #include "quill/detail/Config.h"                  // for Config

diff --git a/quill/include/quill/detail/LogManager.h b/quill/include/quill/detail/LogManager.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "quill/TweakMe.h"
+
 #include "quill/detail/BackendWorker.h"
 #include "quill/detail/Config.h"
 #include "quill/detail/HandlerCollection.h"

diff --git a/quill/src/Quill.cpp b/quill/src/Quill.cpp
@@ -121,6 +121,15 @@ void set_default_logger_handler(std::initializer_list<Handler*> handlers)
 /***/
 void flush() { detail::LogManagerSingleton::instance().log_manager().flush(); }
 
+/***/
+#if !defined(QUILL_NO_EXCEPTIONS)
+void set_backend_worker_error_handler(backend_worker_error_handler_t backend_worker_error_handler)
+{
+  detail::LogManagerSingleton::instance().log_manager().set_backend_worker_error_handler(
+    std::move(backend_worker_error_handler));
+}
+#endif
+
 // ** Config ** //
 namespace config
 {
@@ -142,15 +151,6 @@ void set_backend_thread_sleep_duration(std::chrono::nanoseconds sleep_duration)
   detail::LogManagerSingleton::instance().log_manager().config().set_backend_thread_sleep_duration(sleep_duration);
 }
 
-/***/
-#if !defined(QUILL_NO_EXCEPTIONS)
-void set_backend_worker_error_handler(backend_worker_error_handler_t backend_worker_error_handler)
-{
-  detail::LogManagerSingleton::instance().log_manager().set_backend_worker_error_handler(
-    std::move(backend_worker_error_handler));
-}
-#endif
-
 } // namespace config
 
 } // namespace quill