From a692f7fbe21559fed07365f8277d153b34e9551c Mon Sep 17 00:00:00 2001
From: Seva <seva@binarytrails.net>
Date: Wed, 5 Jun 2019 16:50:50 -0400
Subject: [PATCH] dhtproxy: add logger to tester & disable client proxy
---
tests/dhtproxytester.cpp | 25 ++++++++++++++++---------
tests/dhtproxytester.h | 8 ++++++--
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/tests/dhtproxytester.cpp b/tests/dhtproxytester.cpp
index abb55d3e..11f6423a 100644
--- a/tests/dhtproxytester.cpp
+++ b/tests/dhtproxytester.cpp
@@ -2,6 +2,7 @@
* Copyright (C) 2019 Savoir-faire Linux Inc.
*
* Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+ * Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,26 +33,32 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DhtProxyTester);
void
DhtProxyTester::setUp() {
- nodePeer.run(42222, {}, true);
- nodeProxy = std::make_shared<dht::DhtRunner>();
- nodeClient = std::make_shared<dht::DhtRunner>();
+ logger = dht::log::getStdLogger();
- nodeProxy->run(42232, {}, true);
+ nodePeer.run(42222, /*identity*/{}, /*threaded*/true);
+
+ nodeProxy = std::make_shared<dht::DhtRunner>();
+ nodeProxy->run(42232, /*identity*/{}, /*threaded*/true);
nodeProxy->bootstrap(nodePeer.getBound());
- server = std::unique_ptr<dht::DhtProxyServer>(new dht::DhtProxyServer(nodeProxy, 8080));
+ serverProxy = std::unique_ptr<dht::DhtProxyServer>(new dht::DhtProxyServer(
+ nodeProxy, 8080, /*pushServer*/"127.0.0.1:8090", logger));
- nodeClient->run(42242, {}, true);
+ nodeClient = std::make_shared<dht::DhtRunner>();
+ nodeClient->run(42242, /*identity*/{}, /*threaded*/true);
nodeClient->bootstrap(nodePeer.getBound());
nodeClient->setProxyServer("127.0.0.1:8080");
- nodeClient->enableProxy(true);
+ //nodeClient->enableProxy(true);
}
void
DhtProxyTester::tearDown() {
+ logger->d("[dhtproxytester] stopping peer node");
nodePeer.join();
nodeClient->join();
- server->stop();
- server = nullptr;
+ logger->d("[dhtproxytester] stopping proxy server");
+ serverProxy->stop();
+ serverProxy = nullptr;
+ logger->d("[dhtproxytester] stopping proxy node");
nodeProxy->join();
}
diff --git a/tests/dhtproxytester.h b/tests/dhtproxytester.h
index 067f7068..464ca0e9 100644
--- a/tests/dhtproxytester.h
+++ b/tests/dhtproxytester.h
@@ -25,6 +25,7 @@
#include <opendht/dhtrunner.h>
#include <opendht/dht_proxy_server.h>
+#include <opendht/log.h>
namespace test {
@@ -61,11 +62,14 @@ class DhtProxyTester : public CppUnit::TestFixture {
void testResubscribeGetValues();
private:
- dht::DhtRunner nodePeer {};
+ dht::DhtRunner nodePeer;
std::shared_ptr<dht::DhtRunner> nodeClient;
std::shared_ptr<dht::DhtRunner> nodeProxy;
- std::unique_ptr<dht::DhtProxyServer> server;
+ std::unique_ptr<dht::DhtProxyServer> serverProxy;
+
+ dht::DhtRunner::Config config {};
+ std::shared_ptr<dht::Logger> logger {};
};
} // namespace test
--
GitLab