Rename fly::logger::LogSink as fly::logger::Sink

Now that it's in a nested namespace, the extra "Log" in the name is a
bit verbose.

Author: trflynn89

bench/main.cpp

@@ -1,6 +1,6 @@
-#include "fly/logger/log_sink.hpp"
 #include "fly/logger/logger.hpp"
 #include "fly/logger/logger_config.hpp"
+#include "fly/logger/sink.hpp"
 #include "fly/logger/styler.hpp"
 #include "fly/types/string/string.hpp"
 
@@ -19,7 +19,7 @@
 /**
  * Log sink to drop all received logs.
  */
-class DropSink : public fly::logger::LogSink
+class DropSink : public fly::logger::Sink
 {
 public:
     bool initialize() override

build/win/libfly/libfly.vcxproj

@@ -175,9 +175,9 @@
     <ClInclude Include="..\..\..\fly\logger\detail\styler_proxy.hpp" />
     <ClInclude Include="..\..\..\fly\logger\detail\win\styler_proxy_impl.hpp" />
     <ClInclude Include="..\..\..\fly\logger\log.hpp" />
-    <ClInclude Include="..\..\..\fly\logger\log_sink.hpp" />
     <ClInclude Include="..\..\..\fly\logger\logger.hpp" />
     <ClInclude Include="..\..\..\fly\logger\logger_config.hpp" />
+    <ClInclude Include="..\..\..\fly\logger\sink.hpp" />
     <ClInclude Include="..\..\..\fly\logger\styler.hpp" />
     <ClInclude Include="..\..\..\fly\net\endpoint.hpp" />
     <ClInclude Include="..\..\..\fly\net\ipv4_address.hpp" />

build/win/libfly/libfly.vcxproj.filters

@@ -124,7 +124,7 @@
     <ClInclude Include="..\..\..\fly\logger\logger_config.hpp">
       <Filter>logger</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\fly\logger\log_sink.hpp">
+    <ClInclude Include="..\..\..\fly\logger\sink.hpp">
       <Filter>logger</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\fly\logger\styler.hpp">

fly/logger/detail/console_sink.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fly/logger/log_sink.hpp"
+#include "fly/logger/sink.hpp"
 
 namespace fly::logger {
 struct Log;
@@ -15,7 +15,7 @@ namespace fly::logger::detail {
  * @author Timothy Flynn ([email protected])
  * @version October 11, 2020
  */
-class ConsoleSink : public fly::logger::LogSink
+class ConsoleSink : public fly::logger::Sink
 {
 public:
     /**

fly/logger/detail/file_sink.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fly/logger/log_sink.hpp"
+#include "fly/logger/sink.hpp"
 
 #include <cstdint>
 #include <filesystem>
@@ -25,7 +25,7 @@ namespace fly::logger::detail {
  * @author Timothy Flynn ([email protected])
  * @version October 11, 2020
  */
-class FileSink : public fly::logger::LogSink
+class FileSink : public fly::logger::Sink
 {
 public:
     /**

fly/logger/logger.cpp

@@ -5,8 +5,8 @@
 #include "fly/logger/detail/file_sink.hpp"
 #include "fly/logger/detail/registry.hpp"
 #include "fly/logger/log.hpp"
-#include "fly/logger/log_sink.hpp"
 #include "fly/logger/logger_config.hpp"
+#include "fly/logger/sink.hpp"
 #include "fly/task/task_runner.hpp"
 
 namespace fly::logger {
@@ -16,7 +16,7 @@ Logger::Logger(
     std::string name,
     std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
     std::shared_ptr<LoggerConfig> config,
-    std::unique_ptr<LogSink> &&sink) noexcept :
+    std::unique_ptr<Sink> &&sink) noexcept :
     m_name(std::move(name)),
     m_config(std::move(config)),
     m_sink(std::move(sink)),
@@ -35,7 +35,7 @@ Logger::~Logger()
 std::shared_ptr<Logger> Logger::create_logger(
     std::string name,
     std::shared_ptr<LoggerConfig> logger_config,
-    std::unique_ptr<LogSink> &&sink)
+    std::unique_ptr<Sink> &&sink)
 {
     return create_logger(std::move(name), nullptr, std::move(logger_config), std::move(sink));
 }
@@ -45,7 +45,7 @@ std::shared_ptr<Logger> Logger::create_logger(
     std::string name,
     std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
     std::shared_ptr<LoggerConfig> logger_config,
-    std::unique_ptr<LogSink> &&sink)
+    std::unique_ptr<Sink> &&sink)
 {
     // Logger has a private constructor, thus cannot be used with std::make_shared. This class is
     // used to expose the private constructor locally.
@@ -55,7 +55,7 @@ std::shared_ptr<Logger> Logger::create_logger(
             std::string &&name,
             std::shared_ptr<fly::task::SequencedTaskRunner> &&task_runner,
             std::shared_ptr<LoggerConfig> &&logger_config,
-            std::unique_ptr<LogSink> &&sink) noexcept :
+            std::unique_ptr<Sink> &&sink) noexcept :
             Logger(
                 std::move(name),
                 std::move(task_runner),

fly/logger/logger.hpp

@@ -110,7 +110,7 @@ class SequencedTaskRunner;
 namespace fly::logger {
 
 class LoggerConfig;
-class LogSink;
+class Sink;
 
 namespace detail {
     class Registry;
@@ -162,7 +162,7 @@ class Logger : public std::enable_shared_from_this<Logger>
     static std::shared_ptr<Logger> create_logger(
         std::string name,
         std::shared_ptr<LoggerConfig> logger_config,
-        std::unique_ptr<LogSink> &&sink);
+        std::unique_ptr<Sink> &&sink);
 
     /**
      * Create an asynchronous logger with the provided log sink.
@@ -178,7 +178,7 @@ class Logger : public std::enable_shared_from_this<Logger>
         std::string name,
         std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
         std::shared_ptr<LoggerConfig> logger_config,
-        std::unique_ptr<LogSink> &&sink);
+        std::unique_ptr<Sink> &&sink);
 
     /**
      * Create a synchronous file logger.
@@ -449,7 +449,7 @@ class Logger : public std::enable_shared_from_this<Logger>
         std::string name,
         std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
         std::shared_ptr<LoggerConfig> config,
-        std::unique_ptr<LogSink> &&sink) noexcept;
+        std::unique_ptr<Sink> &&sink) noexcept;
 
     /**
      * Initialize the log sink.
@@ -487,7 +487,7 @@ class Logger : public std::enable_shared_from_this<Logger>
     const std::string m_name;
 
     std::shared_ptr<LoggerConfig> m_config;
-    std::unique_ptr<LogSink> m_sink;
+    std::unique_ptr<Sink> m_sink;
 
     std::shared_ptr<fly::task::SequencedTaskRunner> m_task_runner;
     std::atomic_bool m_last_task_failed {true};

fly/logger/log_sink.hpp fly/logger/sink.hpp

@@ -13,10 +13,10 @@ struct Log;
  * @author Timothy Flynn ([email protected])
  * @version October 11, 2020
  */
-class LogSink
+class Sink
 {
 public:
-    virtual ~LogSink() = default;
+    virtual ~Sink() = default;
 
     /**
      * Initialize the sink. If initialization fails, the logger will not be started and will not

test/logger/logger.cpp

@@ -2,8 +2,8 @@
 
 #include "test/util/task_manager.hpp"
 
-#include "fly/logger/log_sink.hpp"
 #include "fly/logger/logger_config.hpp"
+#include "fly/logger/sink.hpp"
 #include "fly/task/task_manager.hpp"
 #include "fly/task/task_runner.hpp"
 #include "fly/types/concurrency/concurrent_queue.hpp"
@@ -25,7 +25,7 @@ namespace {
 /**
  * Test log sink to store received logs in a queue for verification.
  */
-class QueueSink : public fly::logger::LogSink
+class QueueSink : public fly::logger::Sink
 {
 public:
     QueueSink(fly::ConcurrentQueue<fly::logger::Log> &logs) : m_logs(logs)
@@ -50,7 +50,7 @@ class QueueSink : public fly::logger::LogSink
 /**
  * Test log sink to drop all received logs.
  */
-class DropSink : public fly::logger::LogSink
+class DropSink : public fly::logger::Sink
 {
 public:
     bool initialize() override
@@ -67,7 +67,7 @@ class DropSink : public fly::logger::LogSink
 /**
  * Test log sink to purposefully fail initialiation.
  */
-class FailInitSink : public fly::logger::LogSink
+class FailInitSink : public fly::logger::Sink
 {
 public:
     bool initialize() override