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/Base/Log.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/Base/Log.cpp')
| -rw-r--r-- | Swiften/Base/Log.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp index abfd2bc..b6f1851 100644 --- a/Swiften/Base/Log.cpp +++ b/Swiften/Base/Log.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2015 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 | */ |
| @@ -30,13 +30,16 @@ Log::~Log() { | |||
| 30 | if (logCallback) { | 30 | if (logCallback) { |
| 31 | logCallback(severity_, std::move(file_), line_, std::move(function_), stream.str()); | 31 | logCallback(severity_, std::move(file_), line_, std::move(function_), stream.str()); |
| 32 | } | 32 | } |
| 33 | else if (logfile) { | ||
| 34 | fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), logfile.get()); | ||
| 35 | fflush(logfile.get()); | ||
| 36 | } | ||
| 37 | else { | 33 | else { |
| 38 | fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), stderr); | 34 | stream << std::endl; |
| 39 | fflush(stderr); | 35 | if (logfile) { |
| 36 | fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), logfile.get()); | ||
| 37 | fflush(logfile.get()); | ||
| 38 | } | ||
| 39 | else { | ||
| 40 | fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), stderr); | ||
| 41 | fflush(stderr); | ||
| 42 | } | ||
| 40 | } | 43 | } |
| 41 | #endif | 44 | #endif |
| 42 | } | 45 | } |