summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-02-03 18:21:12 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-02-05 20:26:22 (GMT)
commitb3a803ed132b5f1b7a21130c5466a8deb106d193 (patch)
treebd50171aa0384f9308efd920b720b83226c6d5f9 /Swiften/Base/Log.cpp
parent28c99a37d09a68ef993330b9ece2732ec03eba8f (diff)
downloadswift-b3a803ed132b5f1b7a21130c5466a8deb106d193.zip
swift-b3a803ed132b5f1b7a21130c5466a8deb106d193.tar.bz2
Make logging thread-safe.
Change-Id: Ifab368474bd9e42e10f2cb0c29ff696c0aeaf3ea
Diffstat (limited to 'Swiften/Base/Log.cpp')
-rw-r--r--Swiften/Base/Log.cpp34
1 files changed, 32 insertions, 2 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp
index 4132353..317798c 100644
--- a/Swiften/Base/Log.cpp
+++ b/Swiften/Base/Log.cpp
@@ -1,13 +1,43 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#include <Swiften/Base/Log.h>
+#include <cstdio>
+
+
namespace Swift {
-bool logging = false;
+static Log::Severity logLevel = Log::warning;
+
+Log::Log() {
+}
+
+Log::~Log() {
+ // Using stdio for thread safety (POSIX file i/o calls are guaranteed to be atomic)
+ fprintf(stderr, "%s", stream.str().c_str());
+ fflush(stderr);
+}
+
+std::ostringstream& Log::getStream(
+ Severity /*severity*/,
+ const std::string& severityString,
+ const std::string& file,
+ int line,
+ const std::string& function) {
+ stream << "[" << severityString << "] " << file << ":" << line << " " << function << ": ";
+ return stream;
+}
+
+Log::Severity Log::getLogLevel() {
+ return logLevel;
+}
+
+void Log::setLogLevel(Severity level) {
+ logLevel = level;
+}
}