1 files changed, 15 insertions, 2 deletions
diff --git a/Swiften/Base/Log.cpp b/Swiften/Base/Log.cpp
index 0efac7e..9b16531 100644
--- a/Swiften/Base/Log.cpp
+++ b/Swiften/Base/Log.cpp
@@ -18,2 +18,3 @@ namespace Swift {
 static Log::Severity logLevel = Log::warning;
+std::unique_ptr<FILE, Log::LogFileClose> Log::logfile;
 
@@ -27,4 +28,10 @@ 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);
+    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
@@ -50,2 +57,8 @@ void Log::setLogLevel(Severity level) {
 
+void Log::setLogFile(const std::string& fileName) {
+    if (!fileName.empty()) {
+        logfile = std::unique_ptr<FILE, Log::LogFileClose>(fopen(fileName.c_str(), "a"));
+    }
+}
+
 }