Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for android sinks #10

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/KDSpdSetup/details.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,16 @@ auto genFromWinStr(toml::string &&typeStr) -> spdlog::sink_ptr

return nullptr;
}
#elif __ANDROID__
auto genFromAndroidStr(toml::string &&typeStr, toml::string &&tag, bool const useRawMsg) -> spdlog::sink_ptr
{
if (typeStr == "android_sink_st") {
return createAndroidSinkStPtr(std::move(tag), useRawMsg);
}
if (typeStr == "android_sink_mt") {
return createAndroidSinkMtPtr(std::move(tag), useRawMsg);
}
}
#endif

} // namespace KDSPDSetup::details
18 changes: 18 additions & 0 deletions src/KDSpdSetup/details.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <spdlog/sinks/syslog_sink.h>
#elif _WIN32
#include <spdlog/sinks/msvc_sink.h>
#elif __ANDROID__
#include <spdlog/sinks/android_sink.h>
#endif

#include <toml.hpp>
Expand Down Expand Up @@ -93,6 +95,8 @@ static auto const linuxStrs{ std::vector<std::string>{ "syslog_sink_st", "syslog
*/
static auto const winStrs{ std::vector<std::string>{ "msvc_sink_st", "msvc_sink_mt" } };

static auto const androidStrs{ std::vector<std::string>{ "android_sink_st", "android_sink_mt" } };

/**
* @brief A simple map associating strings of `spdlog::level::level_enum` names to the enums themselves.
* Used to pass an enum to `spdlog::logger::set_level` given a string read from a TOML table.
Expand Down Expand Up @@ -310,6 +314,11 @@ class SPDMaps
*
*/
#define createMsvcSinkMtPtr createMsvcSinkPtr<std::mutex>

#elif __ANDROID__
#define createAndroidSinkStPtr createAndroidSinkPtr<spdlog::details::null_mutex>

#define createAndroidSinkMtPtr createAndroidSinkPtr<std::mutex>
#endif

/**
Expand Down Expand Up @@ -572,6 +581,13 @@ auto createMsvcSinkPtr() -> std::shared_ptr<spdlog::sinks::msvc_sink<Mutex>>
{
return std::make_shared<spdlog::sinks::msvc_sink<Mutex>>();
}

#elif __ANDROID__
template<typename Mutex>
auto createAndroidSinkPtr(std::string const &&tag, bool const useRawMessage) -> std::shared_ptr<spdlog::sinks::android_sink<Mutex>>
{
return std::make_shared<spdlog::sinks::android_sink<Mutex>>(tag, useRawMessage);
}
#endif

/**
Expand Down Expand Up @@ -649,6 +665,8 @@ auto genFromLinuxStr(toml::string &&typeStr, toml::table &&sinkTable) -> spdlog:
*/
auto genFromWinStr(toml::string &&typeStr) -> spdlog::sink_ptr;

#elif __ANDROID__
auto genFromAndroidStr(toml::string &&typeStr, toml::string &&tag, bool const useRawMsg) -> spdlog::sink_ptr;
#endif

} // namespace KDSPDSetup::details
10 changes: 9 additions & 1 deletion src/KDSpdSetup/setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void setupSink(toml::table &&sinkTable)
auto typeStr = sinkTable.at("type").as_string();

bool ok = false;
for (auto &typeList : { details::fileStrs, details::rotateStrs, details::dailyStrs, details::nullStrs, details::stdStrs, details::linuxStrs, details::winStrs }) {
for (auto &typeList : { details::fileStrs, details::rotateStrs, details::dailyStrs, details::nullStrs, details::stdStrs, details::linuxStrs, details::winStrs, details::androidStrs }) {
if (details::inTypelist(typeStr, typeList)) {
ok = true;
break;
Expand Down Expand Up @@ -83,6 +83,14 @@ void setupSink(toml::table &&sinkTable)
sinkPtr = details::genFromWinStr(std::move(typeStr));
#else
return;
#endif
} else if (details::inTypelist(typeStr, details::androidStrs)) {
#ifdef __ANDROID__
auto tag = (sinkTable.contains("tag")) ? sinkTable.at("tag").as_string() : "spdlog";
auto const useRawMsg = (sinkTable.contains("use_raw_msg")) ? sinkTable.at("use_raw_msg").as_boolean() : false;
sinkPtr = details::genFromAndroidStr(std::move(typeStr), std::move(tag), useRawMsg);
#else
return;
#endif
}

Expand Down