Swiftdiff options
| 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/BoostConnection.cpp | |
| parent | 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff) | |
| download | swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2 | |
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
Diffstat (limited to 'Swiften/Network/BoostConnection.cpp')
| -rw-r--r-- | Swiften/Network/BoostConnection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2018 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -107,7 +107,7 @@ void BoostConnection::doWrite(const SafeByteArray& data) { | |||
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | void BoostConnection::handleConnectFinished(const boost::system::error_code& error) { | 109 | void BoostConnection::handleConnectFinished(const boost::system::error_code& error) { |
| 110 | SWIFT_LOG(debug) << "Connect finished: " << error << std::endl; | 110 | SWIFT_LOG(debug) << "Connect finished: " << error; |
| 111 | if (!error) { | 111 | if (!error) { |
| 112 | eventLoop->postEvent(boost::bind(boost::ref(onConnectFinished), false), shared_from_this()); | 112 | eventLoop->postEvent(boost::bind(boost::ref(onConnectFinished), false), shared_from_this()); |
| 113 | doRead(); | 113 | doRead(); |
| @@ -126,7 +126,7 @@ void BoostConnection::doRead() { | |||
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | void BoostConnection::handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred) { | 128 | void BoostConnection::handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred) { |
| 129 | SWIFT_LOG(debug) << "Socket read " << error << std::endl; | 129 | SWIFT_LOG(debug) << "Socket read " << error; |
| 130 | if (!error) { | 130 | if (!error) { |
| 131 | readBuffer_->resize(bytesTransferred); | 131 | readBuffer_->resize(bytesTransferred); |
| 132 | eventLoop->postEvent(boost::bind(boost::ref(onDataRead), readBuffer_), shared_from_this()); | 132 | eventLoop->postEvent(boost::bind(boost::ref(onDataRead), readBuffer_), shared_from_this()); |
| @@ -141,7 +141,7 @@ void BoostConnection::handleSocketRead(const boost::system::error_code& error, s | |||
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | void BoostConnection::handleDataWritten(const boost::system::error_code& error) { | 143 | void BoostConnection::handleDataWritten(const boost::system::error_code& error) { |
| 144 | SWIFT_LOG(debug) << "Data written " << error << std::endl; | 144 | SWIFT_LOG(debug) << "Data written " << error; |
| 145 | if (!error) { | 145 | if (!error) { |
| 146 | eventLoop->postEvent(boost::ref(onDataWritten), shared_from_this()); | 146 | eventLoop->postEvent(boost::ref(onDataWritten), shared_from_this()); |
| 147 | } | 147 | } |