cleanup

Author: Tsche

example/CMakeLists.txt

@@ -5,9 +5,7 @@ function(DEFINE_EXAMPLE TARGET)
   target_link_libraries(example_${TARGET} PRIVATE rsl-log)
 endfunction()
 
-# DEFINE_EXAMPLE(args)
-# DEFINE_EXAMPLE(colorize)
-# DEFINE_EXAMPLE(spans)
-# DEFINE_EXAMPLE(coroutine)
-# DEFINE_EXAMPLE(systemd)
+DEFINE_EXAMPLE(spans)
+DEFINE_EXAMPLE(coroutine)
+DEFINE_EXAMPLE(systemd)
 DEFINE_EXAMPLE(custom_logger)

example/args.cpp

@@ -28,7 +28,7 @@ int main() {
     // SystemdSink(), 
     TerminalSink(),
     filter(event->severity >= rsl::log_level::ERROR) >> error_sink,
-    filter([](auto const& event){ return event.severity >= rsl::log_level::ERROR; }) >> error_sink
+    filter([](auto const& ev){ return ev.severity >= rsl::log_level::ERROR; }) >> error_sink
   );
   logger.set_as_default();
   // set_output(logger);

example/systemd.cpp

@@ -65,7 +65,7 @@ void emit_event(ExtraFields const* fnc_args,
                 FormatString<Level, Args...> fmt,
                 Args&&... args) {
   // we've already checked against global_min_level in FormatString's ctor
-  // do it again here to avoid instantiating GlobalLogger::emit
+  // do it again here to avoid instantiating `emit`
   if constexpr (Level >= global_min_level) {
     // check context level override
     if (context != nullptr && Level < context->min_level) {
@@ -78,7 +78,6 @@ void emit_event(ExtraFields const* fnc_args,
                          .arguments = fnc_args ? *fnc_args : ExtraFields{},
                          .sloc      = fmt.sloc};
 
-    // RSL_LOG_EMITTER(meta, fmt, std::forward<Args>(args)...);
     selected_logger<Empty...>.emit(meta, fmt, std::forward<Args>(args)...);
   }
 }

include/rsl/logging/_impl/formatter.hpp

@@ -12,8 +12,8 @@ struct AsyncLogger : DefaultLogger {
   template <LogLevel Severity, typename... Args>
   void emit(Metadata& meta, _impl::FormatString<Severity, Args...> fmt, Args&&... args) {
     auto formatter = fmt.make_message;
-    // serialize metadata
     // serialize formatter
+    // serialize metadata
     // serialize arguments
     // submit to message queue
   }

include/rsl/logging/async_logger.hpp

@@ -81,13 +81,13 @@ struct RSL_CONSUMABLE(unconsumed) Context {
 
 extern thread_local Context* current_context;
 
-template <typename T>
+template <typename T = std::monostate>
 struct ContextGuard : private Context {
   T extra;
 
   explicit ContextGuard(std::string name,
                         LogLevel min_level,
-                        T extra,
+                        T extra = {},
                         ExtraFields arguments            = {},
                         rsl::source_location const& sloc = std::source_location::current())
       : Context(name, min_level, arguments, {}, sloc) {
@@ -105,6 +105,7 @@ struct ContextGuard : private Context {
   using Context::enabled_for;
 };
 
+
 namespace _log_impl {
 template <typename T>
 concept has_member_op_co_await = requires(T t) { t.operator co_await(); };

include/rsl/logging/context.hpp

@@ -80,36 +80,32 @@ template <typename... Ts>
 Output(Ts&&...) -> Output<Ts...>;
 
 struct NullLogger {
-  constexpr static auto min_level = LogLevel::DISABLE;
-
-  void context(Metadata const& meta, bool entered, bool async_handover) const {}
+  static void context(Metadata const& meta, bool entered, bool async_handover) {}
 
   template <LogLevel Severity, typename... Args>
-  void emit(Metadata& meta, _impl::FormatString<Severity, Args...> fmt, Args&&... args) const {}
+  static void emit(Metadata& meta, _impl::FormatString<Severity, Args...> fmt, Args&&... args) {}
 };
 
 struct DefaultLogger {
-  constexpr static auto min_level = LogLevel::INFO;
-
-  void context(Metadata const& meta, bool entered, bool async_handover) const {
-    if (auto* logger = current_output()) {
+  static void context(Metadata const& meta, bool entered, bool async_handover) {
+    if (auto* logger = output()) {
       logger->context(meta, entered, async_handover);
     }
   }
 
   template <LogLevel Severity, typename... Args>
-  void emit(Metadata& meta, _impl::FormatString<Severity, Args...> fmt, Args&&... args) const {
+  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 = current_output()) {
+    if (auto* logger = output()) {
       logger->emit(event);
     }
   }
 
-  static LoggerBase*& current_output();
+  static LoggerBase*& output();
   template <typename... Sinks>
   static void set_output(Output<Sinks...>& logger) {
-    current_output() = &logger;
+    output() = &logger;
   }
 };
 

include/rsl/logging/logger.hpp

@@ -9,7 +9,7 @@ LoggerBase* get_default_logger() {
 }
 }  // namespace
 
-LoggerBase*& DefaultLogger::current_output() {
+LoggerBase*& DefaultLogger::output() {
   static LoggerBase* current = get_default_logger();
   return current;
 }