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/EventLoop | |
| 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/EventLoop')
| -rw-r--r-- | Swiften/EventLoop/DummyEventLoop.cpp | 2 | ||||
| -rw-r--r-- | Swiften/EventLoop/EventLoop.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/EventLoop/DummyEventLoop.cpp b/Swiften/EventLoop/DummyEventLoop.cpp index 4712fad..234ba7a 100644 --- a/Swiften/EventLoop/DummyEventLoop.cpp +++ b/Swiften/EventLoop/DummyEventLoop.cpp | |||
| @@ -15,7 +15,7 @@ DummyEventLoop::DummyEventLoop() { | |||
| 15 | 15 | ||
| 16 | DummyEventLoop::~DummyEventLoop() { | 16 | DummyEventLoop::~DummyEventLoop() { |
| 17 | if (hasEvents()) { | 17 | if (hasEvents()) { |
| 18 | SWIFT_LOG(warning) << "DummyEventLoop: Unhandled events at destruction time" << std::endl; | 18 | SWIFT_LOG(warning) << "DummyEventLoop: Unhandled events at destruction time"; |
| 19 | } | 19 | } |
| 20 | } | 20 | } |
| 21 | 21 | ||
diff --git a/Swiften/EventLoop/EventLoop.cpp b/Swiften/EventLoop/EventLoop.cpp index 31c93e9..1852f3f 100644 --- a/Swiften/EventLoop/EventLoop.cpp +++ b/Swiften/EventLoop/EventLoop.cpp | |||
| @@ -22,10 +22,10 @@ inline void invokeCallback(const Event& event) { | |||
| 22 | event.callback(); | 22 | event.callback(); |
| 23 | } | 23 | } |
| 24 | catch (const std::exception& e) { | 24 | catch (const std::exception& e) { |
| 25 | SWIFT_LOG(error) << "Uncaught exception in event loop: " << e.what() << std::endl; | 25 | SWIFT_LOG(error) << "Uncaught exception in event loop: " << e.what(); |
| 26 | } | 26 | } |
| 27 | catch (...) { | 27 | catch (...) { |
| 28 | SWIFT_LOG(error) << "Uncaught non-exception in event loop" << std::endl; | 28 | SWIFT_LOG(error) << "Uncaught non-exception in event loop"; |
| 29 | } | 29 | } |
| 30 | } | 30 | } |
| 31 | 31 | ||