1 files changed, 30 insertions, 11 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp
index 9b16531..b6f1851 100644
--- a/Swiften/Base/Log.cpp
+++ b/Swiften/Base/Log.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,6 +17,7 @@ namespace Swift {
 
 static Log::Severity logLevel = Log::warning;
 std::unique_ptr<FILE, Log::LogFileClose> Log::logfile;
+Log::Callback Log::logCallback;
 
 Log::Log() {
 }
@@ -26,24 +27,38 @@ Log::~Log() {
     __android_log_print(ANDROID_LOG_VERBOSE, "Swift", stream.str().c_str(), 1);
 #else
     // Using stdio for thread safety (POSIX file i/o calls are guaranteed to be atomic)
-    if (logfile) {
-        fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), logfile.get());
-        fflush(logfile.get());
+    if (logCallback) {
+        logCallback(severity_, std::move(file_), line_, std::move(function_), stream.str());
     }
     else {
-        fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), stderr);
-        fflush(stderr);
+        stream << std::endl;
+        if (logfile) {
+            fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), logfile.get());
+            fflush(logfile.get());
+        }
+        else {
+            fwrite(stream.str().c_str(), sizeof(char), stream.str().size(), stderr);
+            fflush(stderr);
+        }
     }
 #endif
 }
 
 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;
 }
 
@@ -61,4 +76,8 @@ void Log::setLogFile(const std::string& fileName) {
     }
 }
 
+void Log::setLogCallback(Callback callback) {
+    Log::logCallback = callback;
+}
+
 }