Browse Source

update

master
zhaohe 2 years ago
parent
commit
349d0e875d
  1. 2
      src/iflytop/components/alsaplayer/AudioPlayerAlsaImpl.cpp
  2. 13
      src/iflytop/core/spdlogfactory/logger_factory.cpp
  3. 3
      src/iflytop/core/spdlogfactory/logger_factory.hpp

2
src/iflytop/components/alsaplayer/AudioPlayerAlsaImpl.cpp

@ -42,7 +42,7 @@ static const std::string TAG("AudioPlayerAlsaImpl");
#define MAX_RETRY_DECODE_NUM 8 #define MAX_RETRY_DECODE_NUM 8
#define RETRY_DECODE_TIME_UNIT 300000 #define RETRY_DECODE_TIME_UNIT 300000
ENABLE_LOGGER_STATIC(AudioPlayerAlsaImpl);
// ENABLE_LOGGER_STATIC();
// static zwsd::core::logger_t logger = // static zwsd::core::logger_t logger =
AudioPlayerAlsaImpl::AudioPlayerAlsaImpl(const std::string &audio_dev) AudioPlayerAlsaImpl::AudioPlayerAlsaImpl(const std::string &audio_dev)

13
src/iflytop/core/spdlogfactory/logger_factory.cpp

@ -614,6 +614,15 @@ class MonitoringSpdLoggerConfigTask {
}; };
shared_ptr<logger> SpdLoggerFactory::createLogger(string loggerName) { shared_ptr<logger> SpdLoggerFactory::createLogger(string loggerName) {
/**
* @brief
* main函数之前就创建了logger,
*/
if (default_config.empty()) {
spdlog::critical("you may construct a logger {} before main!!", loggerName);
exit(-1);
}
spdlog::critical("create {}", loggerName);
lock_guard<mutex> lock_gu(createLogger_lock); lock_guard<mutex> lock_gu(createLogger_lock);
if (!loggerName.empty()) { if (!loggerName.empty()) {
if (s_loggerNames.size() == 0) { if (s_loggerNames.size() == 0) {
@ -633,10 +642,6 @@ shared_ptr<logger> SpdLoggerFactory::createLogger(string loggerName) {
} }
if (!initializeLogger) { if (!initializeLogger) {
if (default_config.empty()) {
spdlog::warn("you may construct a logger before main!!");
exit(-1);
}
string configFilePath = getConfigFilePath(); string configFilePath = getConfigFilePath();
if (!configFilePath.empty() && exist(configFilePath)) { if (!configFilePath.empty() && exist(configFilePath)) {
parseSphLogConfig(configFilePath); parseSphLogConfig(configFilePath);

3
src/iflytop/core/spdlogfactory/logger_factory.hpp

@ -39,9 +39,6 @@ typedef shared_ptr<spdlog::logger> logger_t;
#define GET_LOGGER(loggerName) \ #define GET_LOGGER(loggerName) \
iflytop::core::SpdLoggerFactory::Instance().createLogger(#loggerName) iflytop::core::SpdLoggerFactory::Instance().createLogger(#loggerName)
#define ENABLE_LOGGER_STATIC(loggerName) \
static iflytop::core::logger_t logger = \
iflytop::core::SpdLoggerFactory::Instance().createLogger(#loggerName);
class SpdLoggerFactory { class SpdLoggerFactory {
SpdLoggerFactory(){}; SpdLoggerFactory(){};

Loading…
Cancel
Save