From 0fa7f19f3f4ba2fda3d88d8e772508250431c980 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Sat, 13 Aug 2016 16:19:23 -0400 Subject: [PATCH] Fix error reading compression flag from config.ini --- CMakeLists.txt | 1 + libraries/fc | 2 +- programs/steemd/main.cpp | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9af13a9d71..8fee0845e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") endif() endif() + list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) set(CMAKE_EXPORT_COMPILE_COMMANDS "ON") diff --git a/libraries/fc b/libraries/fc index c672e3b4b4..3c1e962159 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit c672e3b4b4676ee90a63dbee4179207bbcd14e56 +Subproject commit 3c1e962159f79e7fbe80fca0c2257317166fc7ef diff --git a/programs/steemd/main.cpp b/programs/steemd/main.cpp index 1144d8c0a1..ff3ca34aea 100644 --- a/programs/steemd/main.cpp +++ b/programs/steemd/main.cpp @@ -284,6 +284,15 @@ fc::optional load_logging_config_from_ini_file(const fc::pat file_appender_config.rotate = true; file_appender_config.rotation_interval = fc::hours(1); file_appender_config.rotation_limit = fc::days(1); + try + { + file_appender_config.rotation_compression = section_tree.get("compress"); + } + catch (const boost::property_tree::ptree_bad_path& e) + { + file_appender_config.rotation_compression = false; + } + logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config))); found_logging_config = true; }