1 files changed, 22 insertions, 6 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp
index 9b16531..abfd2bc 100644
--- a/Swiften/Base/Log.cpp
+++ b/Swiften/Base/Log.cpp
@@ -19,2 +19,3 @@ static Log::Severity logLevel = Log::warning;
 std::unique_ptr<FILE, Log::LogFileClose> Log::logfile;
+Log::Callback Log::logCallback;
 
@@ -28,3 +29,6 @@ Log::~Log() {
     // Using stdio for thread safety (POSIX file i/o calls are guaranteed to be atomic)
-    if (logfile) {
+    if (logCallback) {
+        logCallback(severity_, std::move(file_), line_, std::move(function_), stream.str());
+    }
+    else if (logfile) {
         fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), logfile.get());
@@ -40,8 +44,16 @@ Log::~Log() {
 std::ostringstream& Log::getStream(
-        Severity /*severity*/,
-        const std::string& severityString,
-        const std::string& file,
+        Severity severity,
+        std::string severityString,
+        std::string file,
         int line,
-        const std::string& function) {
-    stream << "[" << severityString << "] " << file << ":" << line << " " << function << ": ";
+        std::string function) {
+    if (logCallback) {
+        severity_ = severity;
+        file_ = std::move(file);
+        line_ = line;
+        function_ = std::move(function);
+    }
+    else {
+        stream << "[" << severityString << "] " << file << ":" << line << " " << function << ": ";
+    }
     return stream;
@@ -63,2 +75,6 @@ void Log::setLogFile(const std::string& fileName) {
 
+void Log::setLogCallback(Callback callback) {
+    Log::logCallback = callback;
+}
+
 }