core: change logging from environment variable to configuration file-based
GlobalConfigurationFixture uses unit-tests.conf to determine default
and module specific logging levels. Logging will gracefully default to
INFO if unit-tests.conf is not found. See unit-tests.conf.sample for a
sample configuration file.
refs: #1375, #1267
Change-Id: Ib0c4eb4149748e6658f94ef1afa23ddd3072c0fa
diff --git a/daemon/fw/client-control-strategy.cpp b/daemon/fw/client-control-strategy.cpp
index 5028879..14b138d 100644
--- a/daemon/fw/client-control-strategy.cpp
+++ b/daemon/fw/client-control-strategy.cpp
@@ -5,6 +5,7 @@
*/
#include "client-control-strategy.hpp"
+#include "core/logger.hpp"
namespace nfd {
namespace fw {
diff --git a/daemon/fw/face-table.cpp b/daemon/fw/face-table.cpp
index ca7b56f..8601598 100644
--- a/daemon/fw/face-table.cpp
+++ b/daemon/fw/face-table.cpp
@@ -6,6 +6,7 @@
#include "face-table.hpp"
#include "forwarder.hpp"
+#include "core/logger.hpp"
namespace nfd {
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 58ce5a3..8ffda2f 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -6,6 +6,7 @@
#include "forwarder.hpp"
#include "available-strategies.hpp"
+#include "core/logger.hpp"
namespace nfd {
@@ -26,6 +27,11 @@
fw::installStrategies(*this);
}
+Forwarder::~Forwarder()
+{
+
+}
+
void
Forwarder::onIncomingInterest(Face& inFace, const Interest& interest)
{
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index c3898c6..51a75dc 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -32,6 +32,9 @@
public:
Forwarder();
+ VIRTUAL_WITH_TESTS
+ ~Forwarder();
+
const ForwarderCounters&
getCounters() const;
diff --git a/daemon/fw/strategy.cpp b/daemon/fw/strategy.cpp
index d41786d..8ce46c1 100644
--- a/daemon/fw/strategy.cpp
+++ b/daemon/fw/strategy.cpp
@@ -6,6 +6,7 @@
#include "strategy.hpp"
#include "forwarder.hpp"
+#include "core/logger.hpp"
namespace nfd {
namespace fw {