TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A lot of changes to 1.4.17

Browse Source
This commit is contained in:
WolverinDEV 2020-07-28 18:36:30 +02:00
parent a4d7c90945
commit b1f5620760
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BasicChannel.h
View File

@ -67,7 +67,7 @@ namespace ts {
auto permission_manager = this->permissions(); /* copy the manager */ auto permission_manager = this->permissions(); /* copy the manager */
assert(permission_manager); assert(permission_manager);
const auto data = permission_manager->permission_value_flagged(permission); const auto data = permission_manager->permission_value_flagged(permission);
return BasicChannel::permission_granted(data,granted_value, require_granted_value); return BasicChannel::permission_granted(data, granted_value, require_granted_value);
} }
ts_always_inline bool talk_power_granted(const permission::v2::PermissionFlaggedValue& granted_value) { ts_always_inline bool talk_power_granted(const permission::v2::PermissionFlaggedValue& granted_value) {

34
src/log/LogUtils.cpp
View File

@ -110,30 +110,25 @@ namespace logger {
logger(0)->debug("Creating new grouped logger for group {}", group); logger(0)->debug("Creating new grouped logger for group {}", group);
vector<spdlog::sink_ptr> sinks; vector<spdlog::sink_ptr> sinks;
string path; auto path = generate_log_file(group);
if(logConfig->logfileLevel != spdlog::level::off) {
path = generate_log_file(group);
auto logFile = fs::u8path(path); auto logFile = fs::u8path(path);
if(!logFile.parent_path().empty()) if(!logFile.parent_path().empty())
fs::create_directories(logFile.parent_path()); fs::create_directories(logFile.parent_path());
try { try {
auto sink = make_shared<spdlog::sinks::rotating_file_sink_mt>(logFile.string(), 1024 * 1024 * 50, 12); auto sink = make_shared<spdlog::sinks::rotating_file_sink_mt>(logFile.string(), 1024 * 1024 * 50, 12);
sink->set_formatter(std::make_unique<LogFormatter>(::logger::currentConfig()->file_colored)); sink->set_formatter(std::make_unique<LogFormatter>(::logger::currentConfig()->file_colored));
sinks.push_back(sink); sinks.push_back(sink);
} catch(std::exception& ex) { } catch(std::exception& ex) {
if(group != 0 && group != -1) if(group != 0 && group != -1)
logger(0)->critical("Failed to create file for new log group: {}", ex.what()); logger(0)->critical("Failed to create file for new log group: {}", ex.what());
else else
#ifdef HAVE_CXX_TERMINAL #ifdef HAVE_CXX_TERMINAL
terminal::instance()->writeMessage("§4[CRITICAL] §eFailed to create main log file: " + string{ex.what()}, false); terminal::instance()->writeMessage("§4[CRITICAL] §eFailed to create main log file: " + string{ex.what()}, false);
#else #else
std::cout << "[CRITICAL] Failed to create main log file: " << ex.what() << "\n"; std::cout << "[CRITICAL] Failed to create main log file: " << ex.what() << "\n";
#endif #endif
}
} else {
path = "/dev/null (" + to_string(group) + ")";
} }
sinks.push_back(terminalSink); sinks.push_back(terminalSink);
@ -143,6 +138,7 @@ namespace logger {
std::shared_ptr<spdlog::logger> logger; std::shared_ptr<spdlog::logger> logger;
if(!logConfig->sync) { if(!logConfig->sync) {
logger = std::make_shared<spdlog::async_logger>("Logger (" + path + ")", sinks.begin(), sinks.end(), logging_threads, async_overflow_policy::block); logger = std::make_shared<spdlog::async_logger>("Logger (" + path + ")", sinks.begin(), sinks.end(), logging_threads, async_overflow_policy::block);
logger->flush_on(level::debug);
} else { } else {
logger = std::make_shared<spdlog::logger>("Logger (" + path + ")", sinks.begin(), sinks.end()); logger = std::make_shared<spdlog::logger>("Logger (" + path + ")", sinks.begin(), sinks.end());
logger->flush_on(level::trace); logger->flush_on(level::trace);