diff options
author | Edwin Mons <edwin.mons@isode.com> | 2019-11-13 12:03:22 (GMT) |
---|---|---|
committer | Edwin Mons <edwin.mons@isode.com> | 2019-11-13 12:46:21 (GMT) |
commit | d640ec248ca8bf86a03007a0f8df352df696cf92 (patch) | |
tree | 049bda0ad8e3fe50eda047b5e8086fd903cb5afe /Swiften/Base/Log.h | |
parent | 959a42d21fd70ea002da9afa7482194e8b6097e1 (diff) | |
download | swift-d640ec248ca8bf86a03007a0f8df352df696cf92.zip swift-d640ec248ca8bf86a03007a0f8df352df696cf92.tar.bz2 |
Support application-supplied logging
This adds a method to set a logging callback. If such a callback is
set, all SWIFT_LOG calls will invoke this callback instead of writing to
either stderr or the swift logging file.
Test-Information:
Updated unit tests pass.
Checked that logs generated by Swift and Sluift (which do not set the
callback) resulted in logging in the expected location.
Change-Id: I0eb2a1057aa77839e1b8d5f320205eb9d5fdc253
Diffstat (limited to 'Swiften/Base/Log.h')
-rw-r--r-- | Swiften/Base/Log.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Swiften/Base/Log.h b/Swiften/Base/Log.h index e3e04a5..255e478 100644 --- a/Swiften/Base/Log.h +++ b/Swiften/Base/Log.h @@ -7,6 +7,7 @@ #pragma once #include <cstdio> +#include <functional> #include <memory> #include <sstream> @@ -18,20 +19,22 @@ 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 { @@ -43,6 +46,11 @@ namespace Swift { }; std::ostringstream stream; static std::unique_ptr<FILE, LogFileClose> logfile; + static Callback logCallback; + Severity severity_; + std::string file_; + int line_; + std::string function_; }; } |