monero_headers.h amended

main.cpp

@@ -11,12 +11,6 @@ using namespace restbed;
 
 using boost::filesystem::path;
 
-// needed for log system of momero
-namespace epee {
-    unsigned int g_test_dbg_lock_sleep = 0;
-}
-
-
 int
 main(int ac, const char* av[])
 {

src/CurrentBlockchainStatus.cpp

@@ -109,8 +109,10 @@ CurrentBlockchainStatus::set_testnet(bool is_testnet)
 bool
 CurrentBlockchainStatus::init_monero_blockchain()
 {
-    // enable basic monero log output
-    xmreg::enable_monero_log();
+
+    // set  monero log output level
+    uint32_t log_level = 0;
+    mlog_configure("", true);
 
     // initialize mcore and core_storage
     if (!xmreg::init_blockchain(blockchain_path,

src/monero_headers.h

@@ -15,8 +15,6 @@
 #define OUTPUT_EXPORT_FILE_MAGIC "Monero output export\002"
 
 
-#include "net/http_base.h"
-#include "net/http_server_handlers_map2.h"
 #include "net/http_client.h"
 #include "storages/http_abstract_invoke.h"
 
@@ -33,6 +31,8 @@
 #include "ringct/rctOps.h"
 #include "ringct/rctSigs.h"
 
+#include "easylogging++.h"
+
 #include "common/base58.h"
 
 #include "string_coding.h"

src/tools.h

@@ -159,15 +159,6 @@ get_payment_id(const transaction& tx,
                crypto::hash& payment_id,
                crypto::hash8& payment_id8);
 
-
-inline void
-enable_monero_log() {
-    uint32_t log_level = 0;
-    log_space::log_singletone::get_set_log_detalisation_level(true, log_level);
-    log_space::log_singletone::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
-}
-
-
 inline double
 get_xmr(uint64_t core_amount)
 {