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.

Sign up for GitHub

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

revert change for log #38

Merged
merged 1 commit into from
Mar 15, 2024
Merged

revert change for log #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@

build
# vcpkg
vcpkg
vcpkg
.vscode
20 changes: 0 additions & 20 deletions bcos-utilities/BoostLogInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <boost/log/core/core.hpp>
#include <boost/log/support/date_time.hpp>
#include <boost/log/utility/setup/common_attributes.hpp>
#include <algorithm>
#include <string>

using namespace bcos;

Expand Down Expand Up @@ -128,34 +126,16 @@ void BoostLogInitializer::initStatLog(
void BoostLogInitializer::initLog(boost::property_tree::ptree const& _pt,
std::string const& _logger, std::string const& _logPrefix)
{
// replace ~ with %, because only % is used as escape character in boost log
char toReplace = '`';
char replacement = '%';

m_running.store(true);
// get log level
m_logLevel = getLogLevel(_pt.get<std::string>("log.level", "info"));
m_consoleLog = _pt.get<bool>("log.enable_console_output", false);

m_logFormat = _pt.get<std::string>("log.format", "");
std::replace_if(
m_logFormat.begin(), m_logFormat.end(), [&toReplace](char c) { return c == toReplace; },
replacement);

m_logNamePattern = _pt.get<std::string>("log.log_name_pattern", "log_%Y%m%d_%H%M.log");
std::replace_if(
m_logNamePattern.begin(), m_logNamePattern.end(),
[&toReplace](char c) { return c == toReplace; }, replacement);

m_compressArchive = _pt.get<bool>("log.compress_archive_file", false);
m_archivePath = _pt.get<std::string>("log.archive_path", "");

m_rotateFileNamePattern =
_pt.get<std::string>("log.rotate_name_pattern", "log_%Y%m%d%H.%M.log");
std::replace_if(
m_rotateFileNamePattern.begin(), m_rotateFileNamePattern.end(),
[&toReplace](char c) { return c == toReplace; }, replacement);

m_rotateSize = _pt.get<uint64_t>("log.max_log_file_size", 1024) * MB_IN_BYTES;
if (m_rotateSize < 100 * MB_IN_BYTES)
{
Expand Down
Loading