aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrfree2monero <rfreemonero@op.pl>2015-04-10 16:13:57 +0200
committerrfree2 <rfree@op.pl>2015-04-10 16:54:21 +0200
commit32c19c6c3d677564d217ba31c16fdfc84b4faf80 (patch)
tree04ff7dcf43840494a356485a9f377aab14212e56 /src
parentMerge pull request #259 (diff)
downloadmonero-32c19c6c3d677564d217ba31c16fdfc84b4faf80.tar.xz
[fix] log level change. compilation: dns, tests
old unbound #warning does not block compilation unit tests build fine. Even though the RPC/P2P network type is required again
Diffstat (limited to 'src')
-rw-r--r--src/common/dns_utils.cpp2
-rw-r--r--src/daemon/main.cpp2
-rw-r--r--src/daemon/rpc_command_executor.cpp3
-rw-r--r--src/rpc/core_rpc_server.cpp2
4 files changed, 6 insertions, 3 deletions
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index ece24cf9f..ea7f1078b 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -167,7 +167,7 @@ DNSResolver::DNSResolver() : m_data(new DNSResolverData())
ub_ctx_hosts(m_data->m_ub_context, NULL);
#ifdef DEVELOPER_LIBUNBOUND_OLD
- #warning "Using the work around for old libunbound"
+ #pragma message "Using the work around for old libunbound"
{ // work around for bug https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=515 needed for it to compile on e.g. Debian 7
char * ds_copy = NULL; // this will be the writable copy of string that bugged version of libunbound requires
try {
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 71df34950..62b655ccd 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -232,7 +232,7 @@ int main(int argc, char const * argv[])
else if (epee::log_space::get_set_log_detalisation_level(false) != new_log_level)
{
epee::log_space::get_set_log_detalisation_level(true, new_log_level);
- int otshell_utils_log_level = 100 - (new_log_level * 25);
+ int otshell_utils_log_level = 100 - (new_log_level * 20);
gCurrentLogger.setDebugLevel(otshell_utils_log_level);
LOG_PRINT_L0("LOG_LEVEL set to " << new_log_level);
}
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index a7c9d2365..5d73c7e8c 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -35,6 +35,7 @@
#include "cryptonote_core/cryptonote_core.h"
#include <boost/format.hpp>
#include <ctime>
+#include <string>
namespace daemonize {
@@ -374,7 +375,7 @@ bool t_rpc_command_executor::set_log_level(int8_t level) {
}
}
- tools::success_msg_writer() << "Log level is now " << boost::lexical_cast<std::string>(level);
+ tools::success_msg_writer() << "Log level is now " << std::to_string(level);
return true;
}
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 71eb5b753..8eeac489d 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -392,6 +392,8 @@ namespace cryptonote
else
{
epee::log_space::log_singletone::get_set_log_detalisation_level(true, req.level);
+ int otshell_utils_log_level = 100 - (req.level * 20);
+ gCurrentLogger.setDebugLevel(otshell_utils_log_level);
res.status = CORE_RPC_STATUS_OK;
}
return true;