summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-10-04 16:03:06 (GMT)
committerTobias Markmann <tm@ayena.de>2016-11-04 15:42:02 (GMT)
commitfca0cd94aa9136a58f9a76937e146048bf94811a (patch)
treec87aa4e5b919e7084202b8c4a7be2f45b0aa977b /Swiften/Network
parent97565d022303f3a4554de2c4de82ca12929dc715 (diff)
downloadswift-fca0cd94aa9136a58f9a76937e146048bf94811a.zip
swift-fca0cd94aa9136a58f9a76937e146048bf94811a.tar.bz2
Change logging output to use SWIFT_LOG
Test-Information: Builds on macOS 10.12 and unit tests pass. Change-Id: Icc1bce9a0e0e85377eef0c8b87bf82d37943d3a5
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnection.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.cpp b/Swiften/Network/SOCKS5ProxiedConnection.cpp
index ab678af..2492827 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.cpp
+++ b/Swiften/Network/SOCKS5ProxiedConnection.cpp
@@ -12,9 +12,6 @@
#include <Swiften/Network/SOCKS5ProxiedConnection.h>
-#include <iostream>
-#include <thread>
-
#include <boost/bind.hpp>
#include <Swiften/Base/ByteArray.h>
@@ -82,7 +79,7 @@ void SOCKS5ProxiedConnection::handleProxyInitializeData(std::shared_ptr<SafeByte
return;
}
catch(...) {
- std::cerr << "exception caught" << std::endl;
+ SWIFT_LOG(error) << "exception caught" << std::endl;
}
write(socksConnect);
break;
@@ -116,7 +113,7 @@ void SOCKS5ProxiedConnection::handleProxyInitializeData(std::shared_ptr<SafeByte
setProxyInitializeFinished(true);
}
else {
- std::cerr << "SOCKS Proxy returned an error: " << std::hex << (*data)[1] << std::endl;
+ SWIFT_LOG(error) << "SOCKS Proxy returned an error: " << std::hex << (*data)[1] << std::endl;
setProxyInitializeFinished(false);
}
}