Index: src/chext/TLogger.cpp =================================================================== diff -u -N -rb79aca0d66b1084f230022efe39cc89307482e6d -r3d1de44762647618faf9b5b3a87f89b293899d8d --- src/chext/TLogger.cpp (.../TLogger.cpp) (revision b79aca0d66b1084f230022efe39cc89307482e6d) +++ src/chext/TLogger.cpp (.../TLogger.cpp) (revision 3d1de44762647618faf9b5b3a87f89b293899d8d) @@ -29,8 +29,8 @@ #include #include #include -#include #include +#include namespace logging = boost::log; namespace src = boost::log::sources; @@ -100,21 +100,32 @@ logging::add_common_attributes(); logging::core::get()->add_global_attribute("Scope", attrs::named_scope()); - logging::add_file_log( + auto sink = logging::add_file_log( keywords::file_name = li.strLogPath, keywords::rotation_size = 10 * 1024 * 1024, keywords::open_mode = (std::ios::out | std::ios::app), keywords::format = ( expr::stream << expr::format_date_time< boost::posix_time::ptime >("TimeStamp", "[%Y-%m-%d %H:%M:%S]") - << "[" << logging::trivial::severity << "]: " - //<< expr::format_named_scope("Scopes", "%n") - //<< ":" + << "[" << severity << "]: " << expr::wmessage + << expr::if_(expr::has_attr("Scope")) + [ + expr::stream + << " (" + << expr::format_named_scope("Scope", + keywords::format = "%n", + keywords::depth = 1, + keywords::iteration = expr::forward) + << ")" + ] ) ); + std::locale loc = boost::locale::generator()("en_EN.UTF-8"); + sink->imbue(loc); + severity_level eSeverity = (severity_level)li.dwMinLogLevel; logging::core::get()->set_filter( severity >= eSeverity