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

Merge pull request #954 from majestrate/reduce-log-levels-at-runtime-2019-12-09

Browse Source 
Reduce log levels at runtime
pull/958/head
Jeff 5 years ago committed by GitHub
parent 512a350783 593f1e657a
commit e9fa49c588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 87 additions and 66 deletions
Show Stats Download Patch File Download Diff File

10
llarp/config/config.cpp
Unescape Escape View File

@ -304,13 +304,17 @@ namespace llarp
void
MetricsConfig::fromSection(string_view key, string_view val)
{
if(key == "disable-metrics")
if(key == "enable-metrics")
{
disableMetrics = true;
disableMetrics = IsFalseValue(val);
}
else if(key == "disable-metrics")
{
disableMetrics = IsTrueValue(val);
}
else if(key == "disable-metrics-log")
{
disableMetricLogs = true;
disableMetricLogs = IsTrueValue(val);
}
else if(key == "json-metrics-path")
{

4
llarp/config/config.hpp
Unescape Escape View File

@ -246,8 +246,8 @@ namespace llarp
struct MetricsConfig
{
bool disableMetrics = false;
bool disableMetricLogs = false;
bool disableMetrics = true;
bool disableMetricLogs = true;
fs::path jsonMetricsPath;
std::string metricTankHost;
std::map< std::string, std::string > metricTags;

2
llarp/router/router.cpp
Unescape Escape View File

@ -1042,6 +1042,7 @@ namespace llarp
#if defined(WITH_SYSTEMD)
::sd_notify(0, "READY=1");
#endif
LogContext::Instance().DropToRuntimeLevel();
return _running;
}
@ -1091,6 +1092,7 @@ namespace llarp
return;
_stopping.store(true);
LogContext::Instance().RevertRuntimeLevel();
LogInfo("stopping router");
hiddenServiceContext().StopAll();
_exitContext.Stop();

14
llarp/util/logging/logger.cpp
Unescape Escape View File

@ -36,6 +36,18 @@ namespace llarp
return ctx;
}
void
LogContext::DropToRuntimeLevel()
{
curLevel = runtimeLevel;
}
void
LogContext::RevertRuntimeLevel()
{
curLevel = startupLevel;
}
log_timestamp::log_timestamp() : log_timestamp("%c %Z")
{
}
@ -50,7 +62,7 @@ namespace llarp
void
SetLogLevel(LogLevel lvl)
{
LogContext::Instance().minLevel = lvl;
LogContext::Instance().curLevel = lvl;
}
} // namespace llarp

12
llarp/util/logging/logger.hpp
Unescape Escape View File

@ -83,7 +83,9 @@ namespace llarp
struct LogContext
{
LogContext();
LogLevel minLevel = eLogInfo;
LogLevel curLevel = eLogInfo;
LogLevel startupLevel = eLogInfo;
LogLevel runtimeLevel = eLogWarn;
ILogStream_ptr logStream;
std::string nodeName = "lokinet";
@ -91,6 +93,12 @@ namespace llarp
static LogContext&
Instance();
void
DropToRuntimeLevel();
void
RevertRuntimeLevel();
};
void
@ -102,7 +110,7 @@ namespace llarp
_Log(LogLevel lvl, const char* fname, int lineno, TArgs&&... args) noexcept
{
auto& log = LogContext::Instance();
if(log.minLevel > lvl)
if(log.curLevel > lvl)
return;
std::stringstream ss;

111
test/link/test_llarp_link.cpp
Unescape Escape View File

@ -7,8 +7,6 @@
#include <messages/link_intro.hpp>
#include <messages/discard.hpp>
#include <test_util.hpp>
#include <gtest/gtest.h>
@ -25,7 +23,7 @@ struct LinkLayerTest : public test::LlarpTest< llarp::sodium::CryptoLibSodium >
{
Context()
{
keyManager = std::make_shared<KeyManager>();
keyManager = std::make_shared< KeyManager >();
SecretKey signingKey;
CryptoManager::instance()->identity_keygen(signingKey);
@ -39,30 +37,30 @@ struct LinkLayerTest : public test::LlarpTest< llarp::sodium::CryptoLibSodium >
CryptoManager::instance()->encryption_keygen(transportKey);
keyManager->transportKey = transportKey;
rc.pubkey = signingKey.toPublic();
rc.enckey = encryptionKey.toPublic();
}
std::shared_ptr<thread::ThreadPool> worker;
std::shared_ptr< thread::ThreadPool > worker;
std::shared_ptr<KeyManager> keyManager;
std::shared_ptr< KeyManager > keyManager;
RouterContact rc;
bool madeSession = false;
bool gotLIM = false;
bool gotLIM = false;
bool
bool
IsGucci() const
{
return gotLIM && madeSession;
}
void Setup()
void
Setup()
{
worker = std::make_shared<thread::ThreadPool>(1, 128, "test-worker");
worker->start();
worker = std::make_shared< thread::ThreadPool >(1, 128, "test-worker");
worker->start();
}
const RouterContact&
@ -133,7 +131,7 @@ struct LinkLayerTest : public test::LlarpTest< llarp::sodium::CryptoLibSodium >
Context Alice;
Context Bob;
bool success = false;
bool success = false;
const bool shouldDebug = false;
llarp_ev_loop_ptr netLoop;
@ -149,7 +147,7 @@ struct LinkLayerTest : public test::LlarpTest< llarp::sodium::CryptoLibSodium >
void
SetUp()
{
oldLevel = llarp::LogContext::Instance().minLevel;
oldLevel = llarp::LogContext::Instance().curLevel;
if(shouldDebug)
llarp::SetLogLevel(eLogTrace);
oldRCLifetime = RouterContact::Lifetime;
@ -193,18 +191,18 @@ struct LinkLayerTest : public test::LlarpTest< llarp::sodium::CryptoLibSodium >
TEST_F(LinkLayerTest, TestIWP)
{
#ifdef WIN32
GTEST_SKIP();
GTEST_SKIP();
#else
auto sendDiscardMessage = [](ILinkSession* s, auto callback) -> bool {
auto sendDiscardMessage = [](ILinkSession* s, auto callback) -> bool {
// send discard message in reply to complete unit test
std::vector< byte_t> tmp(32);
llarp_buffer_t otherBuf(tmp);
DiscardMessage discard;
if(!discard.BEncode(&otherBuf))
return false;
return s->SendMessageBuffer(std::move(tmp), callback);
};
Alice.link = iwp::NewInboundLink(
std::vector< byte_t > tmp(32);
llarp_buffer_t otherBuf(tmp);
DiscardMessage discard;
if(!discard.BEncode(&otherBuf))
return false;
return s->SendMessageBuffer(std::move(tmp), callback);
};
Alice.link = iwp::NewInboundLink(
// KeyManager
Alice.keyManager,
@ -213,16 +211,16 @@ TEST_F(LinkLayerTest, TestIWP)
// LinkMessageHandler
[&](ILinkSession* s, const llarp_buffer_t& buf) -> bool {
llarp_buffer_t copy(buf.base, buf.sz);
if(not Alice.gotLIM)
llarp_buffer_t copy(buf.base, buf.sz);
if(not Alice.gotLIM)
{
LinkIntroMessage msg;
if(msg.BDecode(&copy))
{
LinkIntroMessage msg;
if(msg.BDecode(&copy))
{
Alice.gotLIM = s->GotLIM(&msg);
}
Alice.gotLIM = s->GotLIM(&msg);
}
return Alice.gotLIM;
}
return Alice.gotLIM;
},
// SignBufferFunc
@ -238,7 +236,8 @@ TEST_F(LinkLayerTest, TestIWP)
LogInfo("alice established with bob");
Alice.madeSession = true;
sendDiscardMessage(s, [&](auto status) {
success = status == llarp::ILinkSession::DeliveryStatus::eDeliverySuccess;
success =
status == llarp::ILinkSession::DeliveryStatus::eDeliverySuccess;
LogInfo("message sent to bob suceess=", success);
Stop();
});
@ -247,7 +246,7 @@ TEST_F(LinkLayerTest, TestIWP)
// SessionRenegotiateHandler
[&](RouterContact, RouterContact) -> bool { return true; },
// TimeoutHandler
[&](ILinkSession* session) {
ASSERT_FALSE(session->IsEstablished());
@ -258,10 +257,7 @@ TEST_F(LinkLayerTest, TestIWP)
[&](RouterID router) { ASSERT_EQ(router, Alice.GetRouterID()); },
// PumpDoneHandler
[]() {}
);
[]() {});
Bob.link = iwp::NewInboundLink(
// KeyManager
@ -272,24 +268,23 @@ TEST_F(LinkLayerTest, TestIWP)
// LinkMessageHandler
[&](ILinkSession* s, const llarp_buffer_t& buf) -> bool {
llarp_buffer_t copy(buf.base, buf.sz);
if(not Bob.gotLIM)
{
LinkIntroMessage msg;
if(msg.BDecode(&copy))
{
Bob.gotLIM = s->GotLIM(&msg);
}
return Bob.gotLIM;
}
DiscardMessage discard;
if(discard.BDecode(&copy))
llarp_buffer_t copy(buf.base, buf.sz);
if(not Bob.gotLIM)
{
LinkIntroMessage msg;
if(msg.BDecode(&copy))
{
LogInfo("bog got discard message from alice");
return true;
Bob.gotLIM = s->GotLIM(&msg);
}
return false;
return Bob.gotLIM;
}
DiscardMessage discard;
if(discard.BDecode(&copy))
{
LogInfo("bog got discard message from alice");
return true;
}
return false;
},
// SignBufferFunc
@ -297,13 +292,13 @@ TEST_F(LinkLayerTest, TestIWP)
return m_crypto.sign(sig, Bob.keyManager->identityKey, buf);
},
//SessionEstablishedHandler
// SessionEstablishedHandler
[&](ILinkSession* s) -> bool {
if(s->GetRemoteRC().pubkey != Alice.GetRC().pubkey)
return false;
LogInfo("bob established with alice");
Bob.madeSession = true;
return true;
},
@ -319,13 +314,13 @@ TEST_F(LinkLayerTest, TestIWP)
[&](RouterID router) { ASSERT_EQ(router, Alice.GetRouterID()); },
// PumpDoneHandler
[]() {}
);
[]() {});
ASSERT_TRUE(Alice.Start(m_logic, netLoop, AlicePort));
ASSERT_TRUE(Bob.Start(m_logic, netLoop, BobPort));
LogicCall(m_logic, [&]() { ASSERT_TRUE(Alice.link->TryEstablishTo(Bob.GetRC())); });
LogicCall(m_logic,
[&]() { ASSERT_TRUE(Alice.link->TryEstablishTo(Bob.GetRC())); });
RunMainloop();
ASSERT_TRUE(Alice.IsGucci());

Write Preview
Loading…
Cancel
Save