Move logging to subdirectory

daemon/main.cpp

@@ -1,7 +1,7 @@
 #include <config/config.hpp>  // for ensure_config
 #include <llarp.h>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include <csignal>
 

daemon/rcutil.cpp

@@ -1,6 +1,6 @@
 #include <router_contact.hpp>
-#include <util/logger.hpp>
-#include <util/ostream_logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/logging/ostream_logger.hpp>
 
 #include <absl/synchronization/mutex.h>
 #include <cxxopts.hpp>

libabyss/src/client.cpp

@@ -3,7 +3,7 @@
 #include <abyss/md5.hpp>
 #include <crypto/crypto.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace abyss
 {

libabyss/src/server.cpp

@@ -2,7 +2,7 @@
 
 #include <abyss/http.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>

llarp/CMakeLists.txt

@@ -17,25 +17,25 @@ set(LIB_UTIL_SRC
   util/endian.cpp
   util/fs.cpp
   util/json.cpp
-  util/logger.cpp
-  util/android_logger.cpp
-  util/file_logger.cpp
+  util/logging/android_logger.cpp
+  util/logging/file_logger.cpp
+  util/logging/json_logger.cpp
+  util/logging/logger.cpp
+  util/logging/loglevel.cpp
+  util/logging/ostream_logger.cpp
+  util/logging/syslog_logger.cpp
+  util/logging/win32_logger.cpp
   util/logic.cpp
-  util/loglevel.cpp
   util/mem.cpp
-  util/memfn_traits.cpp
   util/memfn.cpp
+  util/memfn_traits.cpp
+  util/metrics.cpp
   util/metrics_core.cpp
   util/metrics_types.cpp
-  util/json_logger.cpp
-  util/ostream_logger.cpp
-  util/syslog_logger.cpp
-  util/win32_logger.cpp
-  util/metrics.cpp
   util/object.cpp
   util/printer.cpp
-  util/queue_manager.cpp
   util/queue.cpp
+  util/queue_manager.cpp
   util/scheduler.cpp
   util/status.cpp
   util/stopwatch.cpp

llarp/config/config.cpp

@@ -6,8 +6,8 @@
 #include <net/net.hpp>
 #include <router_contact.hpp>
 #include <util/fs.hpp>
-#include <util/logger_syslog.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 #include <util/memfn.hpp>
 #include <util/str.hpp>

llarp/config/ini.cpp

@@ -1,5 +1,6 @@
 #include <config/ini.hpp>
-#include <util/logger.hpp>
+
+#include <util/logging/logger.hpp>
 
 #include <cctype>
 #include <fstream>

llarp/context.cpp

@@ -12,7 +12,7 @@
 #include <metrics/stream_publisher.hpp>
 #include <nodedb.hpp>
 #include <router/router.hpp>
-#include <util/logger.h>
+#include <util/logging/logger.h>
 #include <util/memfn.hpp>
 #include <util/metrics.hpp>
 #include <util/scheduler.hpp>

llarp/crypto/encrypted_frame.cpp

@@ -1,7 +1,7 @@
 #include <crypto/encrypted_frame.hpp>
 
 #include <crypto/crypto.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 
 namespace llarp

llarp/dht/localrouterlookup.cpp

@@ -6,7 +6,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/dht/localserviceaddresslookup.cpp

@@ -5,7 +5,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/dht/tx.hpp

@@ -3,7 +3,7 @@
 
 #include <dht/key.hpp>
 #include <dht/txowner.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/status.hpp>
 
 #include <set>

llarp/dht/txholder.hpp

@@ -3,7 +3,6 @@
 
 #include <dht/tx.hpp>
 #include <dht/txowner.hpp>
-#include <util/logger.hpp>
 #include <util/time.hpp>
 #include <util/status.hpp>
 

llarp/dns.cpp

@@ -2,7 +2,7 @@
 
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 void
 hexDump(const char *buffer, uint16_t size)

llarp/dns/message.cpp

@@ -3,7 +3,7 @@
 #include <dns/dns.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 #include <net/ip.hpp>
 

llarp/dns/question.cpp

@@ -1,6 +1,6 @@
 #include <dns/question.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 
 namespace llarp

llarp/dns/rr.cpp

@@ -1,6 +1,6 @@
 #include <dns/rr.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 
 namespace llarp

llarp/dnsc.cpp

@@ -1,6 +1,6 @@
 #include <dnsc.hpp>
 #include <net/net.hpp>  // for llarp::Addr
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #ifndef _WIN32
 #include <arpa/inet.h>

llarp/messages/link_intro.cpp

@@ -4,7 +4,7 @@
 #include <router_contact.hpp>
 #include <router/abstractrouter.hpp>
 #include <util/bencode.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/messages/link_message_parser.cpp

@@ -9,7 +9,7 @@
 #include <messages/relay.hpp>
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/metrics.hpp>
 
 #include <memory>

llarp/messages/relay_commit.cpp

@@ -10,7 +10,7 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/logic.hpp>
 #include <util/memfn.hpp>
 

llarp/messages/relay_status.cpp

@@ -7,7 +7,7 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/logic.hpp>
 #include <util/memfn.hpp>
 

llarp/metrics/metrictank_publisher.cpp

@@ -1,6 +1,6 @@
 #include <metrics/metrictank_publisher.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/variant.hpp>
 
 #include <cstdio>

llarp/net/net.cpp

@@ -14,7 +14,7 @@
 
 #include <net/net_addr.hpp>
 #include <net/ip.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/str.hpp>
 
 #include <cstdio>

llarp/net/net.hpp

@@ -5,7 +5,6 @@
 #include <net/address_info.hpp>
 #include <net/net_int.hpp>
 #include <net/net.h>
-#include <util/logger.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
 #include <util/bits.hpp>

llarp/nodedb.cpp

@@ -5,7 +5,7 @@
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/thread_pool.hpp>

llarp/router/router.cpp

@@ -1,10 +1,10 @@
 #include <router/router.hpp>
 
 #include <config/config.hpp>
-#include <constants/proto.hpp>
 #include <constants/limits.hpp>
-#include <crypto/crypto.hpp>
+#include <constants/proto.hpp>
 #include <crypto/crypto_libsodium.hpp>
+#include <crypto/crypto.hpp>
 #include <dht/context.hpp>
 #include <dht/node.hpp>
 #include <iwp/iwp.hpp>
@@ -14,20 +14,20 @@
 #include <rpc/rpc.hpp>
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
+#include <util/logging/file_logger.hpp>
+#include <util/logging/json_logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/logger.hpp>
 #include <util/memfn.hpp>
-#include <util/file_logger.hpp>
-#include <util/json_logger.hpp>
-#include <util/logger_syslog.hpp>
 #include <util/metrics.hpp>
 #include <util/str.hpp>
-#include <utility>
 #include <utp/utp.hpp>
 
 #include <fstream>
 #include <cstdlib>
 #include <iterator>
 #include <unordered_map>
+#include <utility>
 #if defined(RPI) || defined(ANDROID)
 #include <unistd.h>
 #endif

llarp/router_contact.cpp

@@ -5,7 +5,7 @@
 #include <net/net.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 #include <util/printer.hpp>
 #include <util/time.hpp>

llarp/rpc/rpc.cpp

@@ -2,7 +2,7 @@
 
 #include <router/abstractrouter.hpp>
 #include <service/context.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <router_id.hpp>
 #include <exit/context.hpp>
 

llarp/service/endpoint_util.cpp

@@ -3,7 +3,7 @@
 #include <exit/session.hpp>
 #include <service/outbound_context.hpp>
 #include <service/lookup.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/util/aligned.hpp

@@ -3,7 +3,7 @@
 
 #include <util/bencode.h>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 #include <util/traits.hpp>
 

llarp/util/bencode.cpp

@@ -1,5 +1,5 @@
 #include <util/bencode.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <cstdlib>
 #include <cinttypes>
 #include <cstdio>

llarp/util/bencode.hpp

@@ -4,7 +4,7 @@
 #include <util/buffer.hpp>
 #include <util/bencode.h>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 
 #include <fstream>

llarp/util/codel.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_CODEL_QUEUE_HPP
 #define LLARP_CODEL_QUEUE_HPP
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 #include <util/threading.hpp>
 #include <util/time.hpp>

llarp/util/fs.cpp

@@ -1,6 +1,6 @@
 #include <util/fs.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>

llarp/util/logging/android_logger.cpp

@@ -1,6 +1,8 @@
 #if defined(ANDROID)
-#include <util/android_logger.hpp>
-#include <util/logger_internal.hpp>
+
+#include <util/logging/android_logger.hpp>
+#include <util/logging/logger_internal.hpp>
+
 #include <android/log.h>
 namespace llarp
 {

llarp/util/logging/android_logger.hpp

@@ -1,7 +1,8 @@
 #ifndef LLARP_UTIL_ANDROID_LOGGER_HPP
 #define LLARP_UTIL_ANDROID_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
+
 #include <iostream>
 
 namespace llarp

llarp/util/logging/file_logger.cpp

@@ -1,5 +1,6 @@
-#include <util/file_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/file_logger.hpp>
+#include <util/logging/logger_internal.hpp>
+
 #include <utility>
 
 namespace llarp

llarp/util/logging/file_logger.hpp

@@ -1,7 +1,8 @@
 #ifndef LLARP_UTIL_FILE_LOGGER_HPP
 #define LLARP_UTIL_FILE_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
+
 #include <util/thread_pool.hpp>
 #include <util/time.hpp>
 

llarp/util/logging/json_logger.cpp

@@ -1,4 +1,4 @@
-#include <util/json_logger.hpp>
+#include <util/logging/json_logger.hpp>
 #include <util/json.hpp>
 
 namespace llarp
@@ -17,4 +17,4 @@ namespace llarp
     m_Lines.emplace_back(obj.dump());
   }
 
-}  // namespace llarp
+}  // namespace llarp

llarp/util/logging/json_logger.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_JSON_LOGGER
 #define LLARP_UTIL_JSON_LOGGER
 
-#include <util/file_logger.hpp>
+#include <util/logging/file_logger.hpp>
 
 namespace llarp
 {
@@ -19,4 +19,4 @@ namespace llarp
   };
 }  // namespace llarp
 
-#endif
+#endif

llarp/util/logging/logger.cpp

@@ -1,11 +1,11 @@
-#include <util/logger.hpp>
-#include <util/logger.h>
-#include <util/ostream_logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/logging/logger.h>
+#include <util/logging/ostream_logger.hpp>
 #if defined(_WIN32)
-#include <util/win32_logger.hpp>
+#include <util/logging/win32_logger.hpp>
 #endif
 #if defined(ANDROID)
-#include <util/android_logger.hpp>
+#include <util/logging/android_logger.hpp>
 #endif
 
 namespace llarp

llarp/util/logging/logger.hpp

@@ -2,8 +2,8 @@
 #define LLARP_UTIL_LOGGER_HPP
 
 #include <util/time.hpp>
-#include <util/logstream.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/logstream.hpp>
+#include <util/logging/logger_internal.hpp>
 /*
 #ifdef _WIN32
 #define VC_EXTRALEAN

llarp/util/logging/logger_syslog.hpp

@@ -1,6 +1,7 @@
 #ifndef LLARP_UTIL_LOGGER_SYSLOG_HPP
 #define LLARP_UTIL_LOGGER_SYSLOG_HPP
-#include <util/logstream.hpp>
+
+#include <util/logging/logstream.hpp>
 #include <iostream>
 
 namespace llarp

llarp/util/logging/loglevel.cpp

@@ -1,4 +1,4 @@
-#include <util/loglevel.hpp>
+#include <util/logging/loglevel.hpp>
 
 namespace llarp
 {
@@ -19,4 +19,4 @@ namespace llarp
         return "???";
     }
   }
-}  // namespace llarp
+}  // namespace llarp

llarp/util/logging/logstream.hpp

@@ -1,10 +1,12 @@
 #ifndef LLARP_UTIL_LOG_STREAM_HPP
 #define LLARP_UTIL_LOG_STREAM_HPP
+#include <util/logging/loglevel.hpp>
+
+#include <util/time.hpp>
+
 #include <memory>
 #include <string>
-#include <util/loglevel.hpp>
 #include <sstream>
-#include <util/time.hpp>
 
 namespace llarp
 {

llarp/util/logging/ostream_logger.cpp

@@ -1,5 +1,5 @@
-#include <util/ostream_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/ostream_logger.hpp>
+#include <util/logging/logger_internal.hpp>
 
 namespace llarp
 {

llarp/util/logging/ostream_logger.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_OSTREAM_LOGGER_HPP
 #define LLARP_UTIL_OSTREAM_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
 #include <iostream>
 
 namespace llarp

llarp/util/logging/syslog_logger.cpp

@@ -1,6 +1,8 @@
 #ifndef _WIN32
-#include <util/logger_syslog.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/logger_syslog.hpp>
+
+#include <util/logging/logger_internal.hpp>
+
 #include <syslog.h>
 namespace llarp
 {

llarp/util/logging/win32_logger.cpp

@@ -1,6 +1,6 @@
 #if defined(_WIN32)
-#include <util/win32_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/win32_logger.hpp>
+#include <util/logging/logger_internal.hpp>
 
 static CONSOLE_SCREEN_BUFFER_INFO consoleInfo;
 static short old_attrs;

llarp/util/logging/win32_logger.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_WIN32_LOGGER_HPP
 #define LLARP_UTIL_WIN32_LOGGER_HPP
 #if defined(_WIN32)
-#include <util/ostream_logger.hpp>
+#include <util/logging/ostream_logger.hpp>
 #define VC_EXTRALEAN
 #include <windows.h>
 

llarp/util/logic.cpp

@@ -1,6 +1,6 @@
 #include <util/logic.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.h>
 
 namespace llarp

llarp/util/threading.cpp

@@ -1,6 +1,6 @@
 #include <util/threading.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #ifdef POSIX
 #include <pthread.h>

llarp/util/threadpool.cpp

@@ -1,4 +1,4 @@
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/time.hpp>
 #include <util/threadpool.h>
 #include <util/thread_pool.hpp>

llarp/util/timer.cpp

@@ -1,4 +1,3 @@
-#include <util/logger.hpp>
 #include <util/time.hpp>
 #include <util/timer.hpp>
 

vendor/libtuntap-master/tuntap.cpp

@@ -50,7 +50,7 @@ inet_ntop(int af, const void *src, char *dst, size_t size);
 
 #include <stdarg.h>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include "tuntap.h"
 

vendor/libtuntap-master/tuntap_log.cpp

@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include <tuntap.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 extern "C"
 {