diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 20:31:16 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 20:31:16 -0500 |
| commit | ac7df193ca47261c2dfd91b230489e20955013a2 (patch) | |
| tree | e4d312059948a0528583e7ea58d2c0b40307a494 /contrib/epee/include/net/levin_protocol_handler.h | |
| parent | Merge pull request #1578 (diff) | |
| parent | Change logging to easylogging++ (diff) | |
| download | monero-ac7df193ca47261c2dfd91b230489e20955013a2.tar.xz | |
Merge pull request #1522
5833d66f Change logging to easylogging++ (moneromooo-monero)
dc98019b easylogging++: fix logging with static const header only data members (moneromooo-monero)
3b46617b easylogging++: add ELPP_DISABLE_CHECK_MACROS (moneromooo-monero)
6fe39d90 easylogging++: allow clipping a common filename prefix (moneromooo-monero)
43abf6ff easylogging++: add file-only logs (moneromooo-monero)
c313bea4 eayslogging++: Fix bad memory access before opening any files (moneromooo-monero)
0af5d168 easylogging++: avoid creating directory/filename for the builtin default log file (moneromooo-monero)
28362847 easylogging++: allow setting thread names (moneromooo-monero)
ec71ce8d easylogging++: Print thread ID in a nicer way (moneromooo-monero)
2a0bf783 easylogging++: Add logging categories (moneromooo-monero)
c50bbbfe easylogging++: import upstream (moneromooo-monero)
Diffstat (limited to 'contrib/epee/include/net/levin_protocol_handler.h')
| -rw-r--r-- | contrib/epee/include/net/levin_protocol_handler.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/epee/include/net/levin_protocol_handler.h b/contrib/epee/include/net/levin_protocol_handler.h index 512ba1c3c..3e1b8493a 100644 --- a/contrib/epee/include/net/levin_protocol_handler.h +++ b/contrib/epee/include/net/levin_protocol_handler.h @@ -32,6 +32,9 @@ #include <boost/uuid/uuid_generators.hpp> #include "levin_base.h" +#undef MONERO_DEFAULT_LOG_CATEGORY +#define MONERO_DEFAULT_LOG_CATEGORY "net" + namespace epee { namespace levin @@ -85,7 +88,7 @@ namespace levin { if(!m_config.m_pcommands_handler) { - LOG_ERROR("Command handler not set!"); + LOG_ERROR_CC(m_conn_context, "Command handler not set!"); return false; } m_cach_in_buffer.append((const char*)ptr, cb); @@ -100,7 +103,7 @@ namespace levin { if(m_cach_in_buffer.size() >= sizeof(uint64_t) && *((uint64_t*)m_cach_in_buffer.data()) != LEVIN_SIGNATURE) { - LOG_ERROR("Signature missmatch on accepted connection"); + LOG_ERROR_CC(m_conn_context, "Signature missmatch on accepted connection"); return false; } is_continue = false; @@ -110,7 +113,7 @@ namespace levin bucket_head* phead = (bucket_head*)m_cach_in_buffer.data(); if(LEVIN_SIGNATURE != phead->m_signature) { - LOG_ERROR("Signature missmatch on accepted connection"); + LOG_ERROR_CC(m_conn_context, "Signature missmatch on accepted connection"); return false; } m_current_head = *phead; @@ -154,7 +157,7 @@ namespace levin m_state = conn_state_reading_head; break; default: - LOG_ERROR("Undefined state in levin_server_impl::connection_handler, m_state=" << m_state); + LOG_ERROR_CC(m_conn_context, "Undefined state in levin_server_impl::connection_handler, m_state=" << m_state); return false; } } |