Remove std::endl from SWIFT_LOG calls

The std::endl is now added by ~Log, but only for output to stderr or a log file. Calls to the Android logging system or manually set callbacks will not include the newline in the logging output. JIRA: SWIFT-430 Test-Information: Unit tests pass on Debian 9 Checked that running Swift with logging to stderr still had a newline. Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
author: Edwin Mons <edwin.mons@isode.com> 2019-11-19 13:36:05 (GMT)
committer: Edwin Mons <edwin.mons@isode.com> 2019-11-19 13:58:45 (GMT)
commit: 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
tree: c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swiften/Network
parent: 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
download: swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip
swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2
18 files changed, 85 insertions, 85 deletions
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index aaec9f2..1312a3e 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -71,33 +71,33 @@ void BOSHConnection::cancelConnector() {
         connector_->stop();
         connector_.reset();
     }
 }
 
 void BOSHConnection::handleTLSConnected() {
-    SWIFT_LOG(debug) << std::endl;
+    SWIFT_LOG(debug);
     onConnectFinished(false);
 }
 
 void BOSHConnection::handleTLSApplicationDataRead(const SafeByteArray& data) {
-    SWIFT_LOG(debug) << std::endl;
+    SWIFT_LOG(debug);
     handleDataRead(std::make_shared<SafeByteArray>(data));
 }
 
 void BOSHConnection::handleTLSNetowrkDataWriteRequest(const SafeByteArray& data) {
-    SWIFT_LOG(debug) << std::endl;
+    SWIFT_LOG(debug);
     connection_->write(data);
 }
 
 void BOSHConnection::handleRawDataRead(std::shared_ptr<SafeByteArray> data) {
-    SWIFT_LOG(debug) << std::endl;
+    SWIFT_LOG(debug);
     tlsLayer_->handleDataRead(*data.get());
 }
 
 void BOSHConnection::handleTLSError(std::shared_ptr<TLSError> error) {
-    SWIFT_LOG(debug) << (error ? error->getMessage() : "Unknown TLS error") << std::endl;
+    SWIFT_LOG(debug) << (error ? error->getMessage() : "Unknown TLS error");
 }
 
 void BOSHConnection::writeData(const SafeByteArray& data) {
     if (tlsLayer_) {
         tlsLayer_->writeData(data);
     }
@@ -120,13 +120,13 @@ void BOSHConnection::disconnect() {
 void BOSHConnection::restartStream() {
     write(createSafeByteArray(""), true, false);
 }
 
 bool BOSHConnection::setClientCertificate(CertificateWithKey::ref cert) {
     if (tlsLayer_) {
-        SWIFT_LOG(debug) << "set client certificate" << std::endl;
+        SWIFT_LOG(debug) << "set client certificate";
         return tlsLayer_->setClientCertificate(cert);
     }
     else {
         return false;
     }
 }
@@ -208,13 +208,13 @@ void BOSHConnection::write(const SafeByteArray& data, bool streamRestart, bool t
     SafeByteArray safeHeader = createHTTPRequest(data, streamRestart, terminate, rid_, sid_, boshURL_).first;
 
     onBOSHDataWritten(safeHeader);
     writeData(safeHeader);
     pending_ = true;
 
-    SWIFT_LOG(debug) << "write data: " << safeByteArrayToString(safeHeader) << std::endl;
+    SWIFT_LOG(debug) << "write data: " << safeByteArrayToString(safeHeader);
 }
 
 void BOSHConnection::handleConnectFinished(Connection::ref connection) {
     cancelConnector();
     connectionReady_ = !!connection;
     if (connectionReady_) {
@@ -272,13 +272,13 @@ void BOSHConnection::startStream(const std::string& to, unsigned long long rid)
             << contentString;
 
     waitingForStartResponse_ = true;
     SafeByteArray safeHeader = createSafeByteArray(header.str());
     onBOSHDataWritten(safeHeader);
     writeData(safeHeader);
-    SWIFT_LOG(debug) << "write stream header: " << safeByteArrayToString(safeHeader) << std::endl;
+    SWIFT_LOG(debug) << "write stream header: " << safeByteArrayToString(safeHeader);
 }
 
 void BOSHConnection::handleDataRead(std::shared_ptr<SafeByteArray> data) {
     onBOSHDataRead(*data);
     buffer_ = concat(buffer_, *data);
     std::string response = safeByteArrayToString(buffer_);
diff --git a/Swiften/Network/BOSHConnectionPool.cpp b/Swiften/Network/BOSHConnectionPool.cpp
index 8a75e81..3a79a16 100644
--- a/Swiften/Network/BOSHConnectionPool.cpp
+++ b/Swiften/Network/BOSHConnectionPool.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 #include <Swiften/Network/BOSHConnectionPool.h>
 
 #include <climits>
@@ -263,13 +263,13 @@ std::shared_ptr<BOSHConnection> BOSHConnectionPool::createConnection() {
     connection->onConnectFinished.connect(boost::bind(&BOSHConnectionPool::handleConnectFinished, this, _1, connection));
     connection->onSessionTerminated.connect(boost::bind(&BOSHConnectionPool::handleSessionTerminated, this, _1));
     connection->onHTTPError.connect(boost::bind(&BOSHConnectionPool::handleHTTPError, this, _1));
 
     if (boshURL.getScheme() == "https") {
         bool success = connection->setClientCertificate(clientCertificate);
-        SWIFT_LOG(debug) << "setClientCertificate, success: " << success << std::endl;
+        SWIFT_LOG(debug) << "setClientCertificate, success: " << success;
     }
 
     connection->connect();
     connections.push_back(connection);
     return connection;
 }
diff --git a/Swiften/Network/BoostConnection.cpp b/Swiften/Network/BoostConnection.cpp
index 551363d..6ae6bf6 100644
--- a/Swiften/Network/BoostConnection.cpp
+++ b/Swiften/Network/BoostConnection.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/BoostConnection.h>
 
@@ -104,13 +104,13 @@ void BoostConnection::write(const SafeByteArray& data) {
 void BoostConnection::doWrite(const SafeByteArray& data) {
     boost::asio::async_write(socket_, SharedBuffer(data),
             boost::bind(&BoostConnection::handleDataWritten, shared_from_this(), boost::asio::placeholders::error));
 }
 
 void BoostConnection::handleConnectFinished(const boost::system::error_code& error) {
-    SWIFT_LOG(debug) << "Connect finished: " << error << std::endl;
+    SWIFT_LOG(debug) << "Connect finished: " << error;
     if (!error) {
         eventLoop->postEvent(boost::bind(boost::ref(onConnectFinished), false), shared_from_this());
         doRead();
     }
     else if (error != boost::asio::error::operation_aborted) {
         eventLoop->postEvent(boost::bind(boost::ref(onConnectFinished), true), shared_from_this());
@@ -123,13 +123,13 @@ void BoostConnection::doRead() {
     socket_.async_read_some(
             boost::asio::buffer(*readBuffer_),
             boost::bind(&BoostConnection::handleSocketRead, shared_from_this(), boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
 }
 
 void BoostConnection::handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred) {
-    SWIFT_LOG(debug) << "Socket read " << error << std::endl;
+    SWIFT_LOG(debug) << "Socket read " << error;
     if (!error) {
         readBuffer_->resize(bytesTransferred);
         eventLoop->postEvent(boost::bind(boost::ref(onDataRead), readBuffer_), shared_from_this());
         doRead();
     }
     else if (/*error == boost::asio::error::eof ||*/ error == boost::asio::error::operation_aborted) {
@@ -138,13 +138,13 @@ void BoostConnection::handleSocketRead(const boost::system::error_code& error, s
     else {
         eventLoop->postEvent(boost::bind(boost::ref(onDisconnected), ReadError), shared_from_this());
     }
 }
 
 void BoostConnection::handleDataWritten(const boost::system::error_code& error) {
-    SWIFT_LOG(debug) << "Data written " << error << std::endl;
+    SWIFT_LOG(debug) << "Data written " << error;
     if (!error) {
         eventLoop->postEvent(boost::ref(onDataWritten), shared_from_this());
     }
     else if (/*error == boost::asio::error::eof || */error == boost::asio::error::operation_aborted) {
         eventLoop->postEvent(boost::bind(boost::ref(onDisconnected), boost::optional<Error>()), shared_from_this());
     }
diff --git a/Swiften/Network/BoostConnectionServer.cpp b/Swiften/Network/BoostConnectionServer.cpp
index 8db9656..dc05172 100644
--- a/Swiften/Network/BoostConnectionServer.cpp
+++ b/Swiften/Network/BoostConnectionServer.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/BoostConnectionServer.h>
 
@@ -43,13 +43,13 @@ boost::optional<BoostConnectionServer::Error> BoostConnectionServer::tryStart()
             endpoint = boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v6(), port_);
         }
         acceptor_ = new boost::asio::ip::tcp::acceptor(*ioService_, endpoint);
         if (endpoint.protocol() ==  boost::asio::ip::tcp::v6()) {
             boost::system::error_code ec;
             acceptor_->set_option(boost::asio::ip::v6_only(false), ec);
-            SWIFT_LOG_ASSERT(ec, warning) << "IPv4/IPv6 dual-stack support is not supported on this platform." << std::endl;
+            SWIFT_LOG_ASSERT(ec, warning) << "IPv4/IPv6 dual-stack support is not supported on this platform.";
         }
         acceptNextConnection();
     }
     catch (const boost::system::system_error& e) {
         if (e.code() == boost::asio::error::address_in_use) {
             return Conflict;
diff --git a/Swiften/Network/ChainedConnector.cpp b/Swiften/Network/ChainedConnector.cpp
index 94899ad..a9210ba 100644
--- a/Swiften/Network/ChainedConnector.cpp
+++ b/Swiften/Network/ChainedConnector.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2011-2018 Isode Limited.
+ * Copyright (c) 2011-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/ChainedConnector.h>
 
@@ -42,13 +42,13 @@ ChainedConnector::~ChainedConnector() {
 
 void ChainedConnector::setTimeoutMilliseconds(int milliseconds) {
     timeoutMilliseconds = milliseconds;
 }
 
 void ChainedConnector::start() {
-    SWIFT_LOG(debug) << "Starting queued connector for " << hostname << std::endl;
+    SWIFT_LOG(debug) << "Starting queued connector for " << hostname;
 
     connectionFactoryQueue = std::deque<ConnectionFactory*>(connectionFactories.begin(), connectionFactories.end());
     tryNextConnectionFactory();
 }
 
 void ChainedConnector::stop() {
@@ -60,28 +60,28 @@ void ChainedConnector::stop() {
     finish(std::shared_ptr<Connection>(), std::shared_ptr<Error>());
 }
 
 void ChainedConnector::tryNextConnectionFactory() {
     assert(!currentConnector);
     if (connectionFactoryQueue.empty()) {
-        SWIFT_LOG(debug) << "No more connection factories" << std::endl;
+        SWIFT_LOG(debug) << "No more connection factories";
         finish(std::shared_ptr<Connection>(), lastError);
     }
     else {
         ConnectionFactory* connectionFactory = connectionFactoryQueue.front();
-        SWIFT_LOG(debug) << "Trying next connection factory: " << typeid(*connectionFactory).name() << std::endl;
+        SWIFT_LOG(debug) << "Trying next connection factory: " << typeid(*connectionFactory).name();
         connectionFactoryQueue.pop_front();
         currentConnector = Connector::create(hostname, port, serviceLookupPrefix, resolver, connectionFactory, timerFactory);
         currentConnector->setTimeoutMilliseconds(timeoutMilliseconds);
         currentConnector->onConnectFinished.connect(boost::bind(&ChainedConnector::handleConnectorFinished, this, _1, _2));
         currentConnector->start();
     }
 }
 
 void ChainedConnector::handleConnectorFinished(std::shared_ptr<Connection> connection, std::shared_ptr<Error> error) {
-    SWIFT_LOG(debug) << "Connector finished" << std::endl;
+    SWIFT_LOG(debug) << "Connector finished";
     currentConnector->onConnectFinished.disconnect(boost::bind(&ChainedConnector::handleConnectorFinished, this, _1, _2));
     lastError = error;
     currentConnector.reset();
     if (connection) {
         finish(connection, error);
     }
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index a0e6b23..e27b95d 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/Connector.h>
 
@@ -22,13 +22,13 @@ Connector::Connector(const std::string& hostname, unsigned short port, const boo
 
 void Connector::setTimeoutMilliseconds(int milliseconds) {
     timeoutMilliseconds = milliseconds;
 }
 
 void Connector::start() {
-    SWIFT_LOG(debug) << "Starting connector for " << hostname << std::endl;
+    SWIFT_LOG(debug) << "Starting connector for " << hostname;
     assert(!currentConnection);
     assert(!serviceQuery);
     assert(!timer);
     auto hostAddress = HostAddress::fromString(hostname);
     if (timeoutMilliseconds > 0) {
         timer = timerFactory->createTimer(timeoutMilliseconds);
@@ -63,40 +63,40 @@ void Connector::queryAddress(const std::string& hostname) {
     addressQuery = resolver->createAddressQuery(hostname);
     addressQuery->onResult.connect(boost::bind(&Connector::handleAddressQueryResult, shared_from_this(), _1, _2));
     addressQuery->run();
 }
 
 void Connector::handleServiceQueryResult(const std::vector<DomainNameServiceQuery::Result>& result) {
-    SWIFT_LOG(debug) << result.size() << " SRV result(s)" << std::endl;
+    SWIFT_LOG(debug) << result.size() << " SRV result(s)";
     serviceQueryResults = std::deque<DomainNameServiceQuery::Result>(result.begin(), result.end());
     serviceQuery.reset();
     if (!serviceQueryResults.empty()) {
         foundSomeDNS = true;
     }
     tryNextServiceOrFallback();
 }
 
 void Connector::tryNextServiceOrFallback() {
     if (queriedAllServices) {
-        SWIFT_LOG(debug) << "Queried all services" << std::endl;
+        SWIFT_LOG(debug) << "Queried all services";
         finish(std::shared_ptr<Connection>());
     }
     else if (serviceQueryResults.empty()) {
-        SWIFT_LOG(debug) << "Falling back on A resolution" << std::endl;
+        SWIFT_LOG(debug) << "Falling back on A resolution";
         // Fall back on simple address resolving
         queriedAllServices = true;
         queryAddress(hostname);
     }
     else {
-        SWIFT_LOG(debug) << "Querying next address" << std::endl;
+        SWIFT_LOG(debug) << "Querying next address";
         queryAddress(serviceQueryResults.front().hostname);
     }
 }
 
 void Connector::handleAddressQueryResult(const std::vector<HostAddress>& addresses, boost::optional<DomainNameResolveError> error) {
-    SWIFT_LOG(debug) << addresses.size() << " addresses" << std::endl;
+    SWIFT_LOG(debug) << addresses.size() << " addresses";
     addressQuery.reset();
     if (error || addresses.empty()) {
         if (!serviceQueryResults.empty()) {
             serviceQueryResults.pop_front();
         }
         tryNextServiceOrFallback();
@@ -107,21 +107,21 @@ void Connector::handleAddressQueryResult(const std::vector<HostAddress>& address
         tryNextAddress();
     }
 }
 
 void Connector::tryNextAddress() {
     if (addressQueryResults.empty()) {
-        SWIFT_LOG(debug) << "Done trying addresses. Moving on." << std::endl;
+        SWIFT_LOG(debug) << "Done trying addresses. Moving on.";
         // Done trying all addresses. Move on to the next host.
         if (!serviceQueryResults.empty()) {
             serviceQueryResults.pop_front();
         }
         tryNextServiceOrFallback();
     }
     else {
-        SWIFT_LOG(debug) << "Trying next address" << std::endl;
+        SWIFT_LOG(debug) << "Trying next address";
         HostAddress address = addressQueryResults.front();
         addressQueryResults.pop_front();
 
         unsigned short connectPort = (port == 0 ? 5222 : port);
         if (!serviceQueryResults.empty()) {
             connectPort = serviceQueryResults.front().port;
@@ -130,23 +130,23 @@ void Connector::tryNextAddress() {
         tryConnect(HostAddressPort(address, connectPort));
     }
 }
 
 void Connector::tryConnect(const HostAddressPort& target) {
     assert(!currentConnection);
-    SWIFT_LOG(debug) << "Trying to connect to " << target.getAddress().toString() << ":" << target.getPort() << std::endl;
+    SWIFT_LOG(debug) << "Trying to connect to " << target.getAddress().toString() << ":" << target.getPort();
     currentConnection = connectionFactory->createConnection();
     currentConnection->onConnectFinished.connect(boost::bind(&Connector::handleConnectionConnectFinished, shared_from_this(), _1));
     currentConnection->connect(target);
     if (timer) {
         timer->start();
     }
 }
 
 void Connector::handleConnectionConnectFinished(bool error) {
-    SWIFT_LOG(debug) << "ConnectFinished: " << (error ? "error" : "success") << std::endl;
+    SWIFT_LOG(debug) << "ConnectFinished: " << (error ? "error" : "success");
     if (timer) {
             timer->stop();
             timer.reset();
     }
     if (!currentConnection) {
         // We've hit a race condition where multiple finisheds were on the eventloop queue at once.
@@ -192,12 +192,12 @@ void Connector::finish(std::shared_ptr<Connection> connection) {
         currentConnection.reset();
     }
     onConnectFinished(connection, (connection || foundSomeDNS) ? std::shared_ptr<Error>() : std::make_shared<DomainNameResolveError>());
 }
 
 void Connector::handleTimeout() {
-    SWIFT_LOG(debug) << "Timeout" << std::endl;
-    SWIFT_LOG_ASSERT(currentConnection, error) << "Connection not valid but triggered a timeout" <<std::endl;
+    SWIFT_LOG(debug) << "Timeout";
+    SWIFT_LOG_ASSERT(currentConnection, error) << "Connection not valid but triggered a timeout";
     handleConnectionConnectFinished(true);
 }
 
 }
diff --git a/Swiften/Network/EnvironmentProxyProvider.cpp b/Swiften/Network/EnvironmentProxyProvider.cpp
index 65cf4ff..6fbf373 100644
--- a/Swiften/Network/EnvironmentProxyProvider.cpp
+++ b/Swiften/Network/EnvironmentProxyProvider.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2010-2011 Thilo Cestonaro
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/EnvironmentProxyProvider.h>
 
@@ -23,13 +23,13 @@
 
 namespace Swift {
 
 EnvironmentProxyProvider::EnvironmentProxyProvider() {
     socksProxy = getFromEnv("all_proxy", "socks");
     httpProxy = getFromEnv("http_proxy", "http");
-    SWIFT_LOG(debug) << "Environment: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString() << std::endl;
+    SWIFT_LOG(debug) << "Environment: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString();
 }
 
 HostAddressPort EnvironmentProxyProvider::getHTTPConnectProxy() const {
     return httpProxy;
 }
 
diff --git a/Swiften/Network/GConfProxyProvider.cpp b/Swiften/Network/GConfProxyProvider.cpp
index 7c31868..a2f8adc 100644
--- a/Swiften/Network/GConfProxyProvider.cpp
+++ b/Swiften/Network/GConfProxyProvider.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2010-2011 Thilo Cestonaro
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2016-2018 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/GConfProxyProvider.h>
 
@@ -36,13 +36,13 @@ GConfProxyProvider::GConfProxyProvider() {
         glibInitialized = true;
     }
 #endif
 
     socksProxy = getFromGConf("/system/proxy/socks_host", "/system/proxy/socks_port");
     httpProxy = getFromGConf("/system/http_proxy/host", "/system/http_proxy/port");
-    SWIFT_LOG(debug) << "GConf: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString() << std::endl;
+    SWIFT_LOG(debug) << "GConf: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString();
 }
 
 HostAddressPort GConfProxyProvider::getHTTPConnectProxy() const {
     return httpProxy;
 }
 
diff --git a/Swiften/Network/HTTPConnectProxiedConnection.cpp b/Swiften/Network/HTTPConnectProxiedConnection.cpp
index 8eba49e..e63b8e2 100644
--- a/Swiften/Network/HTTPConnectProxiedConnection.cpp
+++ b/Swiften/Network/HTTPConnectProxiedConnection.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2010-2011 Thilo Cestonaro
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2011-2018 Isode Limited.
+ * Copyright (c) 2011-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 
 #include <Swiften/Network/HTTPConnectProxiedConnection.h>
@@ -74,13 +74,13 @@ void HTTPConnectProxiedConnection::initializeProxy() {
             append(data, createSafeByteArray("\r\n"));
         }
 
         nextHTTPRequestHeaders_.clear();
     }
     append(data, createSafeByteArray("\r\n"));
-    SWIFT_LOG(debug) << "HTTP Proxy send headers: " << byteArrayToString(ByteArray(data.begin(), data.end())) << std::endl;
+    SWIFT_LOG(debug) << "HTTP Proxy send headers: " << byteArrayToString(ByteArray(data.begin(), data.end()));
     write(data);
 }
 
 void HTTPConnectProxiedConnection::parseHTTPHeader(const std::string& data, std::string& statusLine, std::vector<std::pair<std::string, std::string> >& headerFields) {
     std::istringstream dataStream(data);
 
@@ -108,13 +108,13 @@ void HTTPConnectProxiedConnection::sendHTTPRequest(const std::string& statusLine
     request << "\r\n";
     write(createSafeByteArray(request.str()));
 }
 
 void HTTPConnectProxiedConnection::handleProxyInitializeData(std::shared_ptr<SafeByteArray> data) {
     std::string dataString = byteArrayToString(ByteArray(data->begin(), data->end()));
-    SWIFT_LOG(debug) << data << std::endl;
+    SWIFT_LOG(debug) << data;
     httpResponseBuffer_.append(dataString);
 
     std::string statusLine;
     std::vector<std::pair<std::string, std::string> > headerFields;
 
     std::string::size_type headerEnd = httpResponseBuffer_.find("\r\n\r\n", 0);
@@ -138,23 +138,23 @@ void HTTPConnectProxiedConnection::handleProxyInitializeData(std::shared_ptr<Saf
     }
 
     std::vector<std::string> tmp = String::split(statusLine, ' ');
     if (tmp.size() > 1) {
         try {
             int status = boost::lexical_cast<int>(tmp[1]);
-            SWIFT_LOG(debug) << "Proxy Status: " << status << std::endl;
+            SWIFT_LOG(debug) << "Proxy Status: " << status;
             if (status / 100 == 2) { // all 2XX states are OK
                 setProxyInitializeFinished(true);
             }
             else {
-                SWIFT_LOG(debug) << "HTTP Proxy returned an error: " << httpResponseBuffer_ << std::endl;
+                SWIFT_LOG(debug) << "HTTP Proxy returned an error: " << httpResponseBuffer_;
                 setProxyInitializeFinished(false);
             }
         }
         catch (boost::bad_lexical_cast&) {
-            SWIFT_LOG(warning) << "Unexpected response: " << tmp[1] << std::endl;
+            SWIFT_LOG(warning) << "Unexpected response: " << tmp[1];
             setProxyInitializeFinished(false);
         }
     }
     else {
         setProxyInitializeFinished(false);
     }
diff --git a/Swiften/Network/HostAddress.cpp b/Swiften/Network/HostAddress.cpp
index 6eca80b..e82f433 100644
--- a/Swiften/Network/HostAddress.cpp
+++ b/Swiften/Network/HostAddress.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/HostAddress.h>
 
@@ -40,13 +40,13 @@ HostAddress::HostAddress(const boost::asio::ip::address& address) : address_(add
 std::string HostAddress::toString() const {
     std::string addressString;
     boost::system::error_code errorCode;
 
     addressString = address_.to_string(errorCode);
     if (errorCode) {
-        SWIFT_LOG(debug) << "error: " << errorCode.message() << std::endl;
+        SWIFT_LOG(debug) << "error: " << errorCode.message();
     }
 
     return addressString;
 }
 
 bool HostAddress::isValid() const {
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp
index 0c33c1f..e20fecd 100644
--- a/Swiften/Network/NATPMPInterface.cpp
+++ b/Swiften/Network/NATPMPInterface.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2018 Isode Limited.
+ * Copyright (c) 2014-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/NATPMPInterface.h>
 
@@ -39,13 +39,13 @@ NATPMPInterface::~NATPMPInterface() {
 bool NATPMPInterface::isAvailable() {
     return getPublicIP() ? true : false;
 }
 
 boost::optional<HostAddress> NATPMPInterface::getPublicIP() {
     if (sendpublicaddressrequest(&p->natpmp) < 0) {
-        SWIFT_LOG(debug) << "Failed to send NAT-PMP public address request!" << std::endl;
+        SWIFT_LOG(debug) << "Failed to send NAT-PMP public address request!";
         return boost::optional<HostAddress>();
     }
 
     int r = 0;
     natpmpresp_t response;
     do {
@@ -64,26 +64,26 @@ boost::optional<HostAddress> NATPMPInterface::getPublicIP() {
     } while (false /*r == NATPMP_TRYAGAIN*/);
 
     if (r == 0) {
         return boost::optional<HostAddress>(HostAddress(reinterpret_cast<const unsigned char*>(&(response.pnu.publicaddress.addr)), 4));
     }
     else {
-        SWIFT_LOG(debug) << "Inavlid NAT-PMP response." << std::endl;
+        SWIFT_LOG(debug) << "Inavlid NAT-PMP response.";
         return boost::optional<HostAddress>();
     }
 }
 
 boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short localPort, unsigned short publicPort) {
     NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP);
     if (sendnewportmappingrequest(
                 &p->natpmp,
                 mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP,
                 mapping.getLocalPort(),
                 mapping.getPublicPort(),
                 mapping.getLeaseInSeconds()) < 0) {
-        SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!" << std::endl;
+        SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!";
         return boost::optional<NATPortMapping>();
     }
 
     int r = 0;
     natpmpresp_t response;
     do {
@@ -103,20 +103,20 @@ boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short l
 
     if (r == 0) {
         NATPortMapping result(response.pnu.newportmapping.privateport, response.pnu.newportmapping.mappedpublicport, NATPortMapping::TCP, response.pnu.newportmapping.lifetime);
         return result;
     }
     else {
-        SWIFT_LOG(debug) << "Invalid NAT-PMP response." << std::endl;
+        SWIFT_LOG(debug) << "Invalid NAT-PMP response.";
         return boost::optional<NATPortMapping>();
     }
 }
 
 bool NATPMPInterface::removePortForward(const NATPortMapping& mapping) {
     if (sendnewportmappingrequest(&p->natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, mapping.getLocalPort(), 0, 0) < 0) {
-        SWIFT_LOG(debug) << "Failed to send NAT-PMP remove forwarding request!" << std::endl;
+        SWIFT_LOG(debug) << "Failed to send NAT-PMP remove forwarding request!";
         return false;
     }
 
     int r = 0;
     natpmpresp_t response;
     do {
@@ -130,13 +130,13 @@ bool NATPMPInterface::removePortForward(const NATPortMapping& mapping) {
     } while(r == NATPMP_TRYAGAIN);
 
     if (r == 0) {
         return true;
     }
     else {
-        SWIFT_LOG(debug) << "Invalid NAT-PMP response." << std::endl;
+        SWIFT_LOG(debug) << "Invalid NAT-PMP response.";
         return false;
     }
 }
 
 
 }
diff --git a/Swiften/Network/PlatformDomainNameServiceQuery.cpp b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
index f884500..2ff14e1 100644
--- a/Swiften/Network/PlatformDomainNameServiceQuery.cpp
+++ b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <boost/asio.hpp>
 
@@ -55,13 +55,13 @@ void PlatformDomainNameServiceQuery::run() {
 void PlatformDomainNameServiceQuery::runBlocking() {
     if (!serviceValid) {
         emitError();
         return;
     }
 
-    SWIFT_LOG(debug) << "Querying " << service << std::endl;
+    SWIFT_LOG(debug) << "Querying " << service;
 
     std::vector<DomainNameServiceQuery::Result> records;
 
 #if defined(SWIFTEN_PLATFORM_WINDOWS)
     DNS_RECORD* responses;
     // FIXME: This conversion doesn't work if unicode is deffed above
@@ -94,13 +94,13 @@ void PlatformDomainNameServiceQuery::runBlocking() {
     res_init();
 
     ByteArray response;
     response.resize(NS_PACKETSZ);
     int responseLength = res_query(const_cast<char*>(service.c_str()), ns_c_in, ns_t_srv, reinterpret_cast<u_char*>(vecptr(response)), response.size());
     if (responseLength == -1) {
-        SWIFT_LOG(debug) << "Error" << std::endl;
+        SWIFT_LOG(debug) << "Error";
         emitError();
         return;
     }
 
     // Parse header
     HEADER* header = reinterpret_cast<HEADER*>(vecptr(response));
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp
index 041ad2d..5431379 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
+++ b/Swiften/Network/PlatformNATTraversalWorker.cpp
@@ -154,24 +154,24 @@ PlatformNATTraversalWorker::~PlatformNATTraversalWorker() {
 NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() const {
 #ifdef HAVE_LIBMINIUPNPC
     if (boost::logic::indeterminate(miniUPnPSupported)) {
         miniUPnPInterface = new MiniUPnPInterface();
         miniUPnPSupported = miniUPnPInterface->isAvailable();
     }
-    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported) << std::endl;
+    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported);
     if (miniUPnPSupported) {
         return miniUPnPInterface;
     }
 #endif
 
 #ifdef HAVE_LIBNATPMP
     if (boost::logic::indeterminate(natPMPSupported)) {
         natPMPInterface = new NATPMPInterface();
         natPMPSupported = natPMPInterface->isAvailable();
     }
-    SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported) << std::endl;
+    SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported);
     if (natPMPSupported) {
         return natPMPInterface;
     }
 #endif
 
     return nullNATTraversalInterface;
diff --git a/Swiften/Network/ProxiedConnection.cpp b/Swiften/Network/ProxiedConnection.cpp
index 4c97e31..0c5cda6 100644
--- a/Swiften/Network/ProxiedConnection.cpp
+++ b/Swiften/Network/ProxiedConnection.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2012-2018 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/ProxiedConnection.h>
 
@@ -34,13 +34,13 @@ ProxiedConnection::~ProxiedConnection() {
     cancelConnector();
     if (connection_) {
         connection_->onDataRead.disconnect(boost::bind(&ProxiedConnection::handleDataRead, shared_from_this(), _1));
         connection_->onDisconnected.disconnect(boost::bind(&ProxiedConnection::handleDisconnected, shared_from_this(), _1));
     }
     if (connected_) {
-        SWIFT_LOG(warning) << "Connection was still established." << std::endl;
+        SWIFT_LOG(warning) << "Connection was still established.";
     }
 }
 
 void ProxiedConnection::cancelConnector() {
     if (connector_) {
         connector_->onConnectFinished.disconnect(boost::bind(&ProxiedConnection::handleConnectFinished, shared_from_this(), _1));
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.cpp b/Swiften/Network/SOCKS5ProxiedConnection.cpp
index d7036f2..c76b6e6 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.cpp
+++ b/Swiften/Network/SOCKS5ProxiedConnection.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2010-2011 Thilo Cestonaro
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2018 Isode Limited.
+ * Copyright (c) 2014-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/SOCKS5ProxiedConnection.h>
 
@@ -47,13 +47,13 @@ void SOCKS5ProxiedConnection::initializeProxy() {
 void SOCKS5ProxiedConnection::handleProxyInitializeData(std::shared_ptr<SafeByteArray> data) {
     SafeByteArray socksConnect;
     boost::asio::ip::address rawAddress = getServer().getAddress().getRawAddress();
     assert(rawAddress.is_v4() || rawAddress.is_v6());
 
     if (proxyState_ == ProxyAuthenticating) {
-        SWIFT_LOG(debug) << "ProxyAuthenticating response received, reply with the connect BYTEs" << std::endl;
+        SWIFT_LOG(debug) << "ProxyAuthenticating response received, reply with the connect BYTEs";
         unsigned char choosenMethod = static_cast<unsigned char> ((*data)[1]);
         if ((*data)[0] == 0x05 && choosenMethod != 0xFF) {
             switch(choosenMethod) { // use the correct Method
                 case 0x00:
                     try {
                         proxyState_ = ProxyConnecting;
@@ -76,27 +76,27 @@ void SOCKS5ProxiedConnection::handleProxyInitializeData(std::shared_ptr<SafeByte
                         socksConnect.push_back(static_cast<unsigned char> ((getServer().getPort() >> 8) & 0xFF)); // highbyte of the port.
                         socksConnect.push_back(static_cast<unsigned char> (getServer().getPort() & 0xFF)); // lowbyte of the port.
                         write(socksConnect);
                         return;
                     }
                     catch(...) {
-                        SWIFT_LOG(error) << "exception caught" << std::endl;
+                        SWIFT_LOG(error) << "exception caught";
                     }
                     write(socksConnect);
                     break;
                 default:
                     setProxyInitializeFinished(true);
                     break;
             }
             return;
         }
         setProxyInitializeFinished(false);
     }
     else if (proxyState_ == ProxyConnecting) {
-        SWIFT_LOG(debug) << "Connect response received, check if successfully." << std::endl;
-        SWIFT_LOG(debug) << "Errorbyte: 0x" << std::hex << static_cast<int> ((*data)[1]) << std::dec << std::endl;
+        SWIFT_LOG(debug) << "Connect response received, check if successfully.";
+        SWIFT_LOG(debug) << "Errorbyte: 0x" << std::hex << static_cast<int> ((*data)[1]) << std::dec;
         /*
 
         data.at(1) can be one of the following:
         0x00     succeeded
         0x01     general SOCKS server failure
         0x02     connection not allowed by ruleset
@@ -106,15 +106,15 @@ void SOCKS5ProxiedConnection::handleProxyInitializeData(std::shared_ptr<SafeByte
         0x06     TTL expired
         0x07     Command not supported (CMD)
         0x08     Address type not supported (ATYP)
         0x09 bis 0xFF     unassigned
         */
         if ((*data)[0] == 0x05 && (*data)[1] == 0x0) {
-            SWIFT_LOG(debug) << "Successfully connected the server via the proxy." << std::endl;
+            SWIFT_LOG(debug) << "Successfully connected the server via the proxy.";
             setProxyInitializeFinished(true);
         }
         else {
-            SWIFT_LOG(error) << "SOCKS Proxy returned an error: " << std::hex << (*data)[1] << std::endl;
+            SWIFT_LOG(error) << "SOCKS Proxy returned an error: " << std::hex << (*data)[1];
             setProxyInitializeFinished(false);
         }
     }
 }
diff --git a/Swiften/Network/UnboundDomainNameResolver.cpp b/Swiften/Network/UnboundDomainNameResolver.cpp
index 1df6b8f..21bc697 100644
--- a/Swiften/Network/UnboundDomainNameResolver.cpp
+++ b/Swiften/Network/UnboundDomainNameResolver.cpp
@@ -61,22 +61,22 @@ class UnboundDomainNameServiceQuery : public DomainNameServiceQuery, public Unbo
             UnboundWrapperHelper* helper = new UnboundWrapperHelper(resolver, shared_from_this());
 
             retval = ub_resolve_async(ubContext, const_cast<char*>(name.c_str()), LDNS_RR_TYPE_SRV,
                           1 /* CLASS IN (internet) */,
                           helper, UnboundDomainNameResolver::unbound_callback_wrapper, NULL);
             if(retval != 0) {
-                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(retval) << std::endl;
+                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(retval);
                 delete helper;
             }
         }
 
         void handleResult(int err, struct ub_result* result) {
             std::vector<DomainNameServiceQuery::Result> serviceRecords;
 
             if(err != 0) {
-                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(err) << std::endl;
+                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(err);
             } else {
                 if(result->havedata) {
                     ldns_pkt* replyPacket = 0;
                     ldns_buffer* buffer = ldns_buffer_new(1024);
                     if (buffer && ldns_wire2pkt(&replyPacket, static_cast<const uint8_t*>(result->answer_packet), result->answer_len) == LDNS_STATUS_OK) {
                         ldns_rr_list* rrList = ldns_pkt_answer(replyPacket);
@@ -102,13 +102,13 @@ class UnboundDomainNameServiceQuery : public DomainNameServiceQuery, public Unbo
                             }
                             char terminator = 0;
                             ldns_buffer_write(buffer, &terminator, sizeof(terminator));
 
                             serviceRecord.hostname = std::string(reinterpret_cast<char*>(ldns_buffer_at(buffer, 0)));
                             serviceRecords.push_back(serviceRecord);
-                            SWIFT_LOG(debug) << "hostname " << serviceRecord.hostname << " added" << std::endl;
+                            SWIFT_LOG(debug) << "hostname " << serviceRecord.hostname << " added";
                         }
                     }
                     if (replyPacket) ldns_pkt_free(replyPacket);
                     if (buffer) ldns_buffer_free(buffer);
                 }
             }
@@ -134,38 +134,38 @@ class UnboundDomainNameAddressQuery : public DomainNameAddressQuery, public Unbo
 
             //FIXME: support AAAA queries in some way
             retval = ub_resolve_async(ubContext, const_cast<char*>(name.c_str()), LDNS_RR_TYPE_A,
                           1 /* CLASS IN (internet) */,
                           helper, UnboundDomainNameResolver::unbound_callback_wrapper, NULL);
             if(retval != 0) {
-                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(retval) << std::endl;
+                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(retval);
                 delete helper;
             }
         }
 
         void handleResult(int err, struct ub_result* result) {
             std::vector<HostAddress> addresses;
             boost::optional<DomainNameResolveError> error;
-            SWIFT_LOG(debug) << "Result for: " << name << std::endl;
+            SWIFT_LOG(debug) << "Result for: " << name;
 
             if(err != 0) {
-                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(err) << std::endl;
+                SWIFT_LOG(debug) << "resolve error: " << ub_strerror(err);
                 error = DomainNameResolveError();
             } else {
                 if(result->havedata) {
                     for(int i=0; result->data[i]; i++) {
                         char address[100];
                         const char* addressStr = 0;
                         if ((addressStr = inet_ntop(AF_INET, result->data[i], address, 100))) {
-                            SWIFT_LOG(debug) << "IPv4 address: " << addressStr << std::endl;
+                            SWIFT_LOG(debug) << "IPv4 address: " << addressStr;
                             addresses.push_back(HostAddress(std::string(addressStr)));
                         } else if ((addressStr = inet_ntop(AF_INET6, result->data[i], address, 100))) {
-                            SWIFT_LOG(debug) << "IPv6 address: " << addressStr << std::endl;
+                            SWIFT_LOG(debug) << "IPv6 address: " << addressStr;
                             addresses.push_back(HostAddress(std::string(addressStr)));
                         } else {
-                            SWIFT_LOG(debug) << "inet_ntop() failed" << std::endl;
+                            SWIFT_LOG(debug) << "inet_ntop() failed";
                             error = DomainNameResolveError();
                         }
                     }
                 } else {
                     error = DomainNameResolveError();
                 }
@@ -179,27 +179,27 @@ class UnboundDomainNameAddressQuery : public DomainNameAddressQuery, public Unbo
         std::string name;
 };
 
 UnboundDomainNameResolver::UnboundDomainNameResolver(IDNConverter* idnConverter, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : idnConverter(idnConverter), ioService(ioService), ubDescriptior(*ioService), eventLoop(eventLoop) {
     ubContext = ub_ctx_create();
     if(!ubContext) {
-        SWIFT_LOG(debug) << "could not create unbound context" << std::endl;
+        SWIFT_LOG(debug) << "could not create unbound context";
     }
     eventOwner = std::make_shared<EventOwner>();
 
     ub_ctx_async(ubContext, true);
 
     int ret;
 
     /* read /etc/resolv.conf for DNS proxy settings (from DHCP) */
     if( (ret=ub_ctx_resolvconf(ubContext, const_cast<char*>("/etc/resolv.conf"))) != 0) {
-        SWIFT_LOG(error) << "error reading resolv.conf: " << ub_strerror(ret) << ". errno says: " << strerror(errno) << std::endl;
+        SWIFT_LOG(error) << "error reading resolv.conf: " << ub_strerror(ret) << ". errno says: " << strerror(errno);
     }
     /* read /etc/hosts for locally supplied host addresses */
     if( (ret=ub_ctx_hosts(ubContext, const_cast<char*>("/etc/hosts"))) != 0) {
-        SWIFT_LOG(error) << "error reading hosts: " << ub_strerror(ret) << ". errno says: " << strerror(errno) << std::endl;
+        SWIFT_LOG(error) << "error reading hosts: " << ub_strerror(ret) << ". errno says: " << strerror(errno);
     }
 
     ubDescriptior.assign(ub_fd(ubContext));
 
     ubDescriptior.async_read_some(boost::asio::null_buffers(), boost::bind(&UnboundDomainNameResolver::handleUBSocketReadable, this, boost::asio::placeholders::error));
 }
@@ -228,13 +228,13 @@ void UnboundDomainNameResolver::handleUBSocketReadable(boost::system::error_code
 }
 
 void UnboundDomainNameResolver::processData() {
     if (ub_poll(ubContext)) {
         int ret = ub_process(ubContext);
         if(ret != 0) {
-            SWIFT_LOG(debug) << "resolve error: " << ub_strerror(ret) << std::endl;
+            SWIFT_LOG(debug) << "resolve error: " << ub_strerror(ret);
         }
     }
 }
 
 std::shared_ptr<DomainNameServiceQuery> UnboundDomainNameResolver::createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain) {
     boost::optional<std::string> encodedDomain = idnConverter->getIDNAEncoded(domain);
diff --git a/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp b/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp
index 065d015..e9268b0 100644
--- a/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp
+++ b/Swiften/Network/UnitTest/HTTPConnectProxiedConnectionTest.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <memory>
 
@@ -34,13 +34,13 @@ namespace {
         public:
             ExampleHTTPTrafficFilter() {}
             virtual ~ExampleHTTPTrafficFilter() {}
 
             virtual std::vector<std::pair<std::string, std::string> > filterHTTPResponseHeader(const std::string& /* statusLine */, const std::vector<std::pair<std::string, std::string> >& response) {
                 filterResponses.push_back(response);
-                SWIFT_LOG(debug) << std::endl;
+                SWIFT_LOG(debug);
                 return filterResponseReturn;
             }
 
             std::vector<std::vector<std::pair<std::string, std::string> > > filterResponses;
 
             std::vector<std::pair<std::string, std::string> > filterResponseReturn;
@@ -406,13 +406,13 @@ class HTTPConnectProxiedConnectionTest : public CppUnit::TestFixture {
             MockConnectionFactory(EventLoop* eventLoop) : eventLoop(eventLoop) {
             }
 
             std::shared_ptr<Connection> createConnection() {
                 std::shared_ptr<MockConnection> connection = std::make_shared<MockConnection>(failingPorts, eventLoop);
                 connections.push_back(connection);
-                SWIFT_LOG(debug) << "new connection created" << std::endl;
+                SWIFT_LOG(debug) << "new connection created";
                 return connection;
             }
 
             EventLoop* eventLoop;
             std::vector< std::shared_ptr<MockConnection> > connections;
             std::vector<HostAddressPort> failingPorts;
diff --git a/Swiften/Network/WindowsProxyProvider.cpp b/Swiften/Network/WindowsProxyProvider.cpp
index 9a60bb4..13fdb25 100644
--- a/Swiften/Network/WindowsProxyProvider.cpp
+++ b/Swiften/Network/WindowsProxyProvider.cpp
@@ -49,13 +49,13 @@ WindowsProxyProvider::WindowsProxyProvider()
         if(result == ERROR_SUCCESS) {
             std::vector<std::string> proxies = String::split(byteArrayToString(dataBuffer), ';');
             std::pair<std::string, std::string> protocolAndProxy;
             for(auto&& proxy : proxies) {
                 if(proxy.find('=') != std::string::npos) {
                     protocolAndProxy = String::getSplittedAtFirst(proxy, '=');
-                    SWIFT_LOG(debug) << "Found proxy: " << protocolAndProxy.first << " => " << protocolAndProxy.second << std::endl;
+                    SWIFT_LOG(debug) << "Found proxy: " << protocolAndProxy.first << " => " << protocolAndProxy.second;
                     if(protocolAndProxy.first.compare("socks") == 0) {
                         socksProxy = getAsHostAddressPort(protocolAndProxy.second);
                     }
                     else if (protocolAndProxy.first.compare("http") == 0) {
                         httpProxy = getAsHostAddressPort(protocolAndProxy.second);
                     }
@@ -83,13 +83,13 @@ HostAddressPort WindowsProxyProvider::getAsHostAddressPort(std::string proxy) {
         // .c_str() is needed as tmp.second can include a \0 char which will end in an exception of the lexical cast.
         // with .c_str() the \0 will not be part of the string which is to be casted
         port = boost::numeric_cast<unsigned short>(boost::lexical_cast<int> (tmp.second.c_str()));
         ret = HostAddressPort(HostAddress::fromString(tmp.first).get(), port);
     }
     catch(...) {
-        SWIFT_LOG(error) << "Exception occured while parsing windows proxy \"getHostAddressPort\"." << std::endl;
+        SWIFT_LOG(error) << "Exception occured while parsing windows proxy \"getHostAddressPort\".";
     }
 
     return ret;
 }
author	Edwin Mons <edwin.mons@isode.com>	2019-11-19 13:36:05 (GMT)
committer	Edwin Mons <edwin.mons@isode.com>	2019-11-19 13:58:45 (GMT)
commit	261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
tree	c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swiften/Network
parent	697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
download	swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2