Skip to content
Snippets Groups Projects
Commit a692f7fb authored by Seva's avatar Seva
Browse files

dhtproxy: add logger to tester & disable client proxy

parent cb349d9c
No related branches found
No related tags found
No related merge requests found
......@@ -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();
}
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment