Index: src/ch/ch.cpp =================================================================== diff -u -N -r12b36349f6214befeace08efa9acc7e03be0d847 -ra08ca9e12d93e9a036a5cf739348ff3ef2a58be8 --- src/ch/ch.cpp (.../ch.cpp) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/ch/ch.cpp (.../ch.cpp) (revision a08ca9e12d93e9a036a5cf739348ff3ef2a58be8) @@ -99,7 +99,9 @@ } CCopyHandlerApp::CCopyHandlerApp() : - m_pMainWindow(nullptr) + m_pMainWindow(nullptr), + m_spAppLoggerConfig(std::make_shared()), + m_spEngineLoggerConfig(std::make_shared()) { // this is the one-instance application InitProtection(); @@ -311,13 +313,20 @@ InitLoggers(); // logger config - logger::TMultiLoggerConfigPtr spAppLoggerConfig = std::make_shared(); - spAppLoggerConfig->SetLogLevel(L"default", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spAppLoggerConfig->SetLogLevel(L"default", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"default", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"Filesystem", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"Filesystem-File", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"Task", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"ST-FastMove", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"ST-CopyMove", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"ST-Delete", (logger::ESeverityLevel)GetPropValue(rCfg)); + m_spEngineLoggerConfig->SetLogLevel(L"ST-ScanDirs", (logger::ESeverityLevel)GetPropValue(rCfg)); // initialize the global log file if it is requested by configuration file CString strLogPath = strPath + _T("\\ch.log"); - m_spLog = logger::MakeLogger(logger::TAsyncMultiLogger::GetInstance()->CreateLoggerData(strLogPath, spAppLoggerConfig), L"App"); + m_spLog = logger::MakeLogger(logger::TAsyncMultiLogger::GetInstance()->CreateLoggerData(strLogPath, m_spAppLoggerConfig), L"App"); LOG_INFO(m_spLog) << _T("============================ Initializing Copy Handler ============================"); LOG_INFO(m_spLog) << _T(""); @@ -500,10 +509,8 @@ { chcore::TConfig& rConfig = GetConfig(); - int iMaxSize = GetPropValue(rConfig); - int iRotateCount = GetPropValue(rConfig); - - logger::TAsyncMultiLogger::GetInstance()->SetRotationInfo(iMaxSize, iRotateCount); + logger::TAsyncMultiLogger::GetInstance()->SetMaxLogSize(GetPropValue(rConfig)); + logger::TAsyncMultiLogger::GetInstance()->SetMaxRotatedCount(GetPropValue(rConfig)); } void CCopyHandlerApp::InitShellExtension() @@ -588,6 +595,11 @@ return m_spLog->GetLogFileData(); } +logger::TMultiLoggerConfigPtr CCopyHandlerApp::GetEngineLoggerConfig() const +{ + return m_spEngineLoggerConfig; +} + void CCopyHandlerApp::RegisterShellExtension() { CString strPath = CString(m_pathProcessor.GetProgramPath()) + _T("\\"); @@ -657,6 +669,8 @@ void CCopyHandlerApp::OnConfigNotify(const chcore::TStringSet& setPropNames) { + chcore::TConfig& rCfg = GetConfig(); + // is this language if(setPropNames.HasValue(PropData::GetPropertyName())) { @@ -665,28 +679,31 @@ GetPropValue(GetConfig(), strPath); GetResManager().SetLanguage(m_pathProcessor.ExpandPath(strPath)); } -/* - if(setPropNames.HasValue(PropData::GetPropertyName())) - { - chcore::TLogger& rLogger = chcore::TLogger::Acquire(); - - rLogger.Enable(GetPropValue(GetConfig())); - } - - if(setPropNames.HasValue(PropData::GetPropertyName())) - { - chcore::TLogger& rLogger = chcore::TLogger::Acquire(); - - rLogger.set_log_level(GetPropValue(GetConfig())); - } - if(setPropNames.HasValue(PropData::GetPropertyName())) - { - chcore::TLogger& rLogger = chcore::TLogger::Acquire(); + logger::TAsyncMultiLogger::GetInstance()->SetMaxLogSize(GetPropValue(GetConfig())); + if(setPropNames.HasValue(PropData::GetPropertyName())) + logger::TAsyncMultiLogger::GetInstance()->SetMaxRotatedCount(GetPropValue(GetConfig())); - rLogger.set_max_size(GetPropValue(GetConfig())); - }*/ + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spLog->GetLogFileData()->GetMultiLoggerConfig()->SetLogLevel(L"default", (logger::ESeverityLevel)GetPropValue(rCfg)); + + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"default", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"Filesystem", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"Filesystem-File", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"Task", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"ST-FastMove", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"ST-CopyMove", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"ST-Delete", (logger::ESeverityLevel)GetPropValue(rCfg)); + if(setPropNames.HasValue(PropData::GetPropertyName())) + m_spEngineLoggerConfig->SetLogLevel(L"ST-ScanDirs", (logger::ESeverityLevel)GetPropValue(rCfg)); } void CCopyHandlerApp::OnResManNotify(UINT uiType)