oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some missing LOKI -> OXEN logger defines 

Various ones were unchanged in epee.

Also found a couple very old MONERO -> OXEN changes as well.
This commit is contained in:
Jason Rhinelander 2021-08-19 16:03:32 -03:00
parent c81cf6fd3b
commit 5b95224c39
20 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/include/epee/console_handler.h
View File

@ -48,8 +48,8 @@
#endif #endif
#include "readline_suspend.h" #include "readline_suspend.h"
#undef MONERO_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "console_handler" #define OXEN_DEFAULT_LOG_CATEGORY "console_handler"
namespace epee namespace epee
{ {

34
contrib/epee/include/epee/misc_log_ex.h
View File

@ -34,14 +34,14 @@
#include "easylogging++.h" #include "easylogging++.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "default" #define OXEN_DEFAULT_LOG_CATEGORY "default"
#define MAX_LOG_FILE_SIZE 104850000 // 100 MB - 7600 bytes #define MAX_LOG_FILE_SIZE 104850000 // 100 MB - 7600 bytes
#define MAX_LOG_FILES 50 #define MAX_LOG_FILES 50
#define CLOG_ENABLED(level, cat) ELPP->vRegistry()->allowed(el::Level::level, cat) #define CLOG_ENABLED(level, cat) ELPP->vRegistry()->allowed(el::Level::level, cat)
#define LOG_ENABLED(level) CLOG_ENABLED(level, LOKI_DEFAULT_LOG_CATEGORY) #define LOG_ENABLED(level) CLOG_ENABLED(level, OXEN_DEFAULT_LOG_CATEGORY)
#define MCLOG_TYPE(level, cat, type, x) do { \ #define MCLOG_TYPE(level, cat, type, x) do { \
if (ELPP->vRegistry()->allowed(level, cat)) { \ if (ELPP->vRegistry()->allowed(level, cat)) { \
@ -67,20 +67,20 @@
#define MCLOG_MAGENTA(level,cat,x) MCLOG_COLOR(level,cat,"35",x) #define MCLOG_MAGENTA(level,cat,x) MCLOG_COLOR(level,cat,"35",x)
#define MCLOG_CYAN(level,cat,x) MCLOG_COLOR(level,cat,"36",x) #define MCLOG_CYAN(level,cat,x) MCLOG_COLOR(level,cat,"36",x)
#define MLOG_RED(level,x) MCLOG_RED(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG_RED(level,x) MCLOG_RED(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MLOG_GREEN(level,x) MCLOG_GREEN(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG_GREEN(level,x) MCLOG_GREEN(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MLOG_YELLOW(level,x) MCLOG_YELLOW(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG_YELLOW(level,x) MCLOG_YELLOW(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MLOG_BLUE(level,x) MCLOG_BLUE(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG_BLUE(level,x) MCLOG_BLUE(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MLOG_MAGENTA(level,x) MCLOG_MAGENTA(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG_MAGENTA(level,x) MCLOG_MAGENTA(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MLOG_CYAN(level,x) MCLOG_CYAN(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG_CYAN(level,x) MCLOG_CYAN(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MFATAL(x) MCFATAL(LOKI_DEFAULT_LOG_CATEGORY,x) #define MFATAL(x) MCFATAL(OXEN_DEFAULT_LOG_CATEGORY,x)
#define MERROR(x) MCERROR(LOKI_DEFAULT_LOG_CATEGORY,x) #define MERROR(x) MCERROR(OXEN_DEFAULT_LOG_CATEGORY,x)
#define MWARNING(x) MCWARNING(LOKI_DEFAULT_LOG_CATEGORY,x) #define MWARNING(x) MCWARNING(OXEN_DEFAULT_LOG_CATEGORY,x)
#define MINFO(x) MCINFO(LOKI_DEFAULT_LOG_CATEGORY,x) #define MINFO(x) MCINFO(OXEN_DEFAULT_LOG_CATEGORY,x)
#define MDEBUG(x) MCDEBUG(LOKI_DEFAULT_LOG_CATEGORY,x) #define MDEBUG(x) MCDEBUG(OXEN_DEFAULT_LOG_CATEGORY,x)
#define MTRACE(x) MCTRACE(LOKI_DEFAULT_LOG_CATEGORY,x) #define MTRACE(x) MCTRACE(OXEN_DEFAULT_LOG_CATEGORY,x)
#define MLOG(level,x) MCLOG(level,LOKI_DEFAULT_LOG_CATEGORY,x) #define MLOG(level,x) MCLOG(level,OXEN_DEFAULT_LOG_CATEGORY,x)
#define MGINFO(x) MCINFO("global",x) #define MGINFO(x) MCINFO("global",x)
#define MGINFO_RED(x) MCLOG_RED(el::Level::Info, "global",x) #define MGINFO_RED(x) MCLOG_RED(el::Level::Info, "global",x)
@ -97,7 +97,7 @@
el::base::Writer(level, __FILE__, __LINE__, ELPP_FUNC, type).construct(cat) << x; \ el::base::Writer(level, __FILE__, __LINE__, ELPP_FUNC, type).construct(cat) << x; \
} \ } \
} while(0) } while(0)
#define MIDEBUG(init, x) IFLOG(el::Level::Debug, LOKI_DEFAULT_LOG_CATEGORY, el::base::DispatchAction::NormalLog, init, x) #define MIDEBUG(init, x) IFLOG(el::Level::Debug, OXEN_DEFAULT_LOG_CATEGORY, el::base::DispatchAction::NormalLog, init, x)
#define LOG_ERROR(x) MERROR(x) #define LOG_ERROR(x) MERROR(x)

4
contrib/epee/include/epee/net/abstract_tcp_server2.h
View File

@ -50,8 +50,8 @@
#include "connection_basic.hpp" #include "connection_basic.hpp"
#include "network_throttle-detail.hpp" #include "network_throttle-detail.hpp"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net" #define OXEN_DEFAULT_LOG_CATEGORY "net"
#define ABSTRACT_SERVER_SEND_QUE_MAX_COUNT 1000 #define ABSTRACT_SERVER_SEND_QUE_MAX_COUNT 1000

4
contrib/epee/include/epee/net/abstract_tcp_server2.inl
View File

@ -51,8 +51,8 @@
#include <functional> #include <functional>
#include <random> #include <random>
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net" #define OXEN_DEFAULT_LOG_CATEGORY "net"
#define AGGRESSIVE_TIMEOUT_THRESHOLD 120 // sockets #define AGGRESSIVE_TIMEOUT_THRESHOLD 120 // sockets
#define NEW_CONNECTION_TIMEOUT_LOCAL 1200000 // 2 minutes #define NEW_CONNECTION_TIMEOUT_LOCAL 1200000 // 2 minutes

4
contrib/epee/include/epee/net/buffer.h
View File

@ -32,8 +32,8 @@
#include "../misc_log_ex.h" #include "../misc_log_ex.h"
#include "../span.h" #include "../span.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net.buffer" #define OXEN_DEFAULT_LOG_CATEGORY "net.buffer"
//#define NET_BUFFER_LOG(x) MDEBUG(x) //#define NET_BUFFER_LOG(x) MDEBUG(x)
#define NET_BUFFER_LOG(x) ((void)0) #define NET_BUFFER_LOG(x) ((void)0)

4
contrib/epee/include/epee/net/levin_protocol_handler.h
View File

@ -33,8 +33,8 @@
#include "levin_base.h" #include "levin_base.h"
#include "../int-util.h" #include "../int-util.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net" #define OXEN_DEFAULT_LOG_CATEGORY "net"
namespace epee namespace epee
{ {

4
contrib/epee/include/epee/net/levin_protocol_handler_async.h
View File

@ -42,8 +42,8 @@
#include <random> #include <random>
#include <chrono> #include <chrono>
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net" #define OXEN_DEFAULT_LOG_CATEGORY "net"
#ifndef MIN_BYTES_WANTED #ifndef MIN_BYTES_WANTED
#define MIN_BYTES_WANTED 512 #define MIN_BYTES_WANTED 512

4
contrib/epee/include/epee/net/net_utils_base.h
View File

@ -40,8 +40,8 @@
#include "../serialization/keyvalue_serialization.h" #include "../serialization/keyvalue_serialization.h"
#include "../int-util.h" #include "../int-util.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net" #define OXEN_DEFAULT_LOG_CATEGORY "net"
#ifndef MAKE_IP #ifndef MAKE_IP
#define MAKE_IP( a1, a2, a3, a4 ) (a1|(a2<<8)|(a3<<16)|(((uint32_t)a4)<<24)) #define MAKE_IP( a1, a2, a3, a4 ) (a1|(a2<<8)|(a3<<16)|(((uint32_t)a4)<<24))

4
contrib/epee/include/epee/serialization/keyvalue_serialization.h
View File

@ -30,8 +30,8 @@
#include "keyvalue_serialization_overloads.h" #include "keyvalue_serialization_overloads.h"
#include "../storages/portable_storage.h" #include "../storages/portable_storage.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "serialization" #define OXEN_DEFAULT_LOG_CATEGORY "serialization"
namespace epee namespace epee
{ {

4
contrib/epee/include/epee/serialization/keyvalue_serialization_overloads.h
View File

@ -37,8 +37,8 @@
#include "../span.h" #include "../span.h"
#include "../storages/portable_storage_base.h" #include "../storages/portable_storage_base.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "serialization" #define OXEN_DEFAULT_LOG_CATEGORY "serialization"
namespace epee namespace epee
{ {

4
contrib/epee/include/epee/storages/levin_abstract_invoke2.h
View File

@ -30,8 +30,8 @@
#include "../span.h" #include "../span.h"
#include "../net/levin_base.h" #include "../net/levin_base.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net" #define OXEN_DEFAULT_LOG_CATEGORY "net"
namespace epee namespace epee
{ {

4
contrib/epee/include/epee/storages/parserse_base_utils.h
View File

@ -33,8 +33,8 @@
#include <string_view> #include <string_view>
#include "../misc_log_ex.h" #include "../misc_log_ex.h"
#undef MONERO_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "serialization" #define OXEN_DEFAULT_LOG_CATEGORY "serialization"
namespace epee namespace epee
{ {

4
contrib/epee/src/buffer.cpp
View File

@ -32,8 +32,8 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net.buffer" #define OXEN_DEFAULT_LOG_CATEGORY "net.buffer"
namespace epee namespace epee
{ {

4
contrib/epee/src/connection_basic.cpp
View File

@ -53,8 +53,8 @@
#define GET_IO_SERVICE(s) ((s).get_io_service()) #define GET_IO_SERVICE(s) ((s).get_io_service())
#endif #endif
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net.conn" #define OXEN_DEFAULT_LOG_CATEGORY "net.conn"
// ################################################################################################ // ################################################################################################
// local (TU local) headers // local (TU local) headers

4
contrib/epee/src/mlocker.cpp
View File

@ -45,8 +45,8 @@
#include <mutex> #include <mutex>
#include <utility> #include <utility>
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "mlocker" #define OXEN_DEFAULT_LOG_CATEGORY "mlocker"
// did an mlock operation previously fail? we only // did an mlock operation previously fail? we only
// want to log an error once and be done with it // want to log an error once and be done with it

10
contrib/epee/src/mlog.cpp
View File

@ -50,12 +50,12 @@ namespace fs { using namespace std::filesystem; }
namespace fs = ghc::filesystem; namespace fs = ghc::filesystem;
#endif #endif
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "logging" #define OXEN_DEFAULT_LOG_CATEGORY "logging"
#define MLOG_BASE_FORMAT "%datetime{%Y-%M-%d %H:%m:%s.%g}\t%thread\t%level\t%logger\t%loc\t%msg" #define MLOG_BASE_FORMAT "%datetime{%Y-%M-%d %H:%m:%s.%g}\t%thread\t%level\t%logger\t%loc\t%msg"
#define MLOG_LOG(x) CINFO(el::base::Writer,el::base::DispatchAction::FileOnlyLog,LOKI_DEFAULT_LOG_CATEGORY) << x #define MLOG_LOG(x) CINFO(el::base::Writer,el::base::DispatchAction::FileOnlyLog,OXEN_DEFAULT_LOG_CATEGORY) << x
using namespace epee; using namespace epee;
@ -157,7 +157,7 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
el::Configurations c; el::Configurations c;
c.setGlobally(el::ConfigurationType::Filename, filename_base); c.setGlobally(el::ConfigurationType::Filename, filename_base);
c.setGlobally(el::ConfigurationType::ToFile, "true"); c.setGlobally(el::ConfigurationType::ToFile, "true");
const char *log_format = getenv("LOKI_LOG_FORMAT"); const char *log_format = getenv("OXEN_LOG_FORMAT");
if (!log_format) if (!log_format)
log_format = MLOG_BASE_FORMAT; log_format = MLOG_BASE_FORMAT;
c.setGlobally(el::ConfigurationType::Format, log_format); c.setGlobally(el::ConfigurationType::Format, log_format);
@ -206,7 +206,7 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
} }
}); });
mlog_set_common_prefix(); mlog_set_common_prefix();
const char *loki_log = getenv("LOKI_LOGS"); const char *loki_log = getenv("OXEN_LOGS");
if (!loki_log) if (!loki_log)
{ {
loki_log = get_default_categories(0); loki_log = get_default_categories(0);

4
contrib/epee/src/network_throttle-detail.cpp
View File

@ -48,8 +48,8 @@
// TODO: // TODO:
#include "epee/net/network_throttle-detail.hpp" #include "epee/net/network_throttle-detail.hpp"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "net.throttle" #define OXEN_DEFAULT_LOG_CATEGORY "net.throttle"
// ################################################################################################ // ################################################################################################
// ################################################################################################ // ################################################################################################

4
src/rpc/bootstrap_daemon.cpp
View File

@ -7,8 +7,8 @@
#include "cryptonote_core/cryptonote_core.h" #include "cryptonote_core/cryptonote_core.h"
#include "epee/misc_log_ex.h" #include "epee/misc_log_ex.h"
#undef MONERO_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "daemon.rpc.bootstrap_daemon" #define OXEN_DEFAULT_LOG_CATEGORY "daemon.rpc.bootstrap_daemon"
namespace cryptonote namespace cryptonote
{ {

4
tests/core_tests/chaingen.h
View File

@ -61,8 +61,8 @@
#include "blockchain_db/testdb.h" #include "blockchain_db/testdb.h"
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "tests.core" #define OXEN_DEFAULT_LOG_CATEGORY "tests.core"
#define TESTS_DEFAULT_FEE ((uint64_t)200000000) // 2 * pow(10, 8) #define TESTS_DEFAULT_FEE ((uint64_t)200000000) // 2 * pow(10, 8)
#define TEST_DEFAULT_DIFFICULTY 1 #define TEST_DEFAULT_DIFFICULTY 1

4
tests/unit_tests/service_nodes_swarm.cpp
View File

@ -36,8 +36,8 @@
#include <iterator> #include <iterator>
#include <random> #include <random>
#undef LOKI_DEFAULT_LOG_CATEGORY #undef OXEN_DEFAULT_LOG_CATEGORY
#define LOKI_DEFAULT_LOG_CATEGORY "sn_unit_tests" #define OXEN_DEFAULT_LOG_CATEGORY "sn_unit_tests"
using namespace service_nodes; using namespace service_nodes;