1 files changed, 22 insertions, 3 deletions
diff --git a/Swiften/Base/Log.h b/Swiften/Base/Log.h
index 33c969d..255e478 100644
--- a/Swiften/Base/Log.h
+++ b/Swiften/Base/Log.h
@@ -6,6 +6,9 @@
 
 #pragma once
 
+#include <cstdio>
+#include <functional>
+#include <memory>
 #include <sstream>
 
 #include <Swiften/Base/API.h>
@@ -16,22 +19,38 @@ namespace Swift {
             enum Severity {
                 error, warning, info, debug
             };
+            using Callback = std::function<void(Severity severity, std::string file, int line, std::string function, std::string message)>;
 
             Log();
             ~Log();
 
             std::ostringstream& getStream(
                     Severity severity,
-                    const std::string& severityString,
-                    const std::string& file,
+                    std::string severityString,
+                    std::string file,
                     int line,
-                    const std::string& function);
+                    std::string function);
 
             static Severity getLogLevel();
             static void setLogLevel(Severity level);
+            static void setLogFile(const std::string& fileName);
+            static void setLogCallback(Callback callback);
 
         private:
+            struct LogFileClose {
+                void operator()(FILE* p) {
+                    if (p) {
+                        fclose(p);
+                    }
+                }
+            };
             std::ostringstream stream;
+            static std::unique_ptr<FILE, LogFileClose> logfile;
+            static Callback logCallback;
+            Severity severity_;
+            std::string file_;
+            int line_;
+            std::string function_;
     };
 }