refactor, add kwargs support

Author: Tsche

example/systemd.cpp

@@ -33,7 +33,7 @@ int main() {
   logger.set_as_default();
   // set_output(logger);
   {
-    $context("main", rsl::log_level::INFO);
+    $context("main", rsl::log_level::INFO, foo=123);
     rsl::info("from main context");
     foo(42, 'c');
   }

include/rsl/log

@@ -6,14 +6,10 @@
 
 #include <utility>
 
-#ifdef RSL_KWARGS
-// #include <kwargs.h>
+#include <rsl/kwargs>
 #  define RSL_LOG_CONTEXT(name, level, ...) \
-    rsl::log::context_guard _(name, level, make_args(__VA_ARGS__), RSL_LOG_ARGS)
-#else
-#  define RSL_LOG_CONTEXT(name, level, ...) \
-    rsl::log::context_guard<std::monostate> _(name, level, std::monostate(), RSL_LOG_ARGS)
-#endif
+    rsl::log::context_guard _(name, level, RSL_LOG_ARGS, RSL_KWARGS(__VA_ARGS__))
+
 
 #define RSL_TRACE(...)                                      \
   (void)(is_enabled_for(::rsl::logging::LogLevel::TRACE) && \

include/rsl/logging/_impl/formatter.hpp

@@ -42,7 +42,7 @@ struct FormatString {
   }
   using initialize_t = void (FormatString::*)(std::string_view, rsl::source_location);
 
-  template <typename T>  //, typename... Empty>
+  template <typename T>
     requires std::convertible_to<T const&, std::string_view>
   consteval explicit(false)
       FormatString(T const& fmt,

include/rsl/logging/logger.hpp

@@ -47,8 +47,8 @@ struct Sink : Filter {
   }
 };
 
-struct LoggerBase {
-  virtual ~LoggerBase()                                                         = default;
+struct OutputBase {
+  virtual ~OutputBase()                                                         = default;
   virtual void context(Metadata const& meta, bool entered, bool async_handover) = 0;
   virtual void emit(Event const& ev)                                            = 0;
 };
@@ -61,7 +61,7 @@ void set_output(Output<Sinks...>& sinks);
 
 template <typename... Ts>
 struct Output final
-    : LoggerBase
+    : OutputBase
     , Any<Ts...> {
   template <typename... Us>
     requires((std::same_as<std::remove_cvref_t<Us>, std::remove_cvref_t<Ts>> && ...))
@@ -88,25 +88,26 @@ struct NullLogger {
 
 struct DefaultLogger {
   static void context(Metadata const& meta, bool entered, bool async_handover) {
-    if (auto* logger = output()) {
-      logger->context(meta, entered, async_handover);
+    if (auto* output = current_output()) {
+      output->context(meta, entered, async_handover);
     }
   }
 
   template <LogLevel Severity, typename... Args>
   static void emit(Metadata& meta, _impl::FormatString<Severity, Args...> fmt, Args&&... args) {
     auto message = fmt.make_message(std::forward<Args>(args)...);
     auto event   = Event{.meta = meta, .text = message};
-    if (auto* logger = output()) {
-      logger->emit(event);
+    if (auto* output = current_output()) {
+      output->emit(event);
     }
   }
 
-  static LoggerBase*& output();
-  template <typename... Sinks>
-  static void set_output(Output<Sinks...>& logger) {
-    output() = &logger;
+  static void set_output(OutputBase& output) {
+    current_output() = &output;
   }
+
+private:
+  static OutputBase*& current_output();
 };
 
 }  // namespace rsl::logging

src/logger.cpp

@@ -3,14 +3,14 @@
 
 namespace rsl::logging {
 namespace {
-LoggerBase* get_default_logger() {
+OutputBase* get_default_logger() {
   static auto logger = Output(TerminalSink());
   return &logger;
 }
 }  // namespace
 
-LoggerBase*& DefaultLogger::output() {
-  static LoggerBase* current = get_default_logger();
+OutputBase*& DefaultLogger::current_output() {
+  static OutputBase* current = get_default_logger();
   return current;
 }