Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'master' of github.com:cryptonomex/graphene

Browse source
This commit is contained in:
Daniel Larimer 2015-07-16 14:28:33 -04:00
commit 984cf47841
1 changed files with 80 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
programs/witness_node/main.cpp
View file

@ -21,6 +21,7 @@
#include <graphene/account_history/account_history_plugin.hpp> #include <graphene/account_history/account_history_plugin.hpp>
#include <graphene/market_history/market_history_plugin.hpp> #include <graphene/market_history/market_history_plugin.hpp>
#include <fc/exception/exception.hpp>
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
#include <fc/interprocess/signals.hpp> #include <fc/interprocess/signals.hpp>
#include <fc/log/console_appender.hpp> #include <fc/log/console_appender.hpp>
@ -100,10 +101,17 @@ int main(int argc, char** argv) {
bpo::store(bpo::parse_config_file<char>(config_ini_path.preferred_string().c_str(), cfg_options, true), options); bpo::store(bpo::parse_config_file<char>(config_ini_path.preferred_string().c_str(), cfg_options, true), options);
// try to get logging options from the config file. // try to get logging options from the config file.
try
{
fc::optional<fc::logging_config> logging_config = load_logging_config_from_ini_file(config_ini_path); fc::optional<fc::logging_config> logging_config = load_logging_config_from_ini_file(config_ini_path);
if (logging_config) if (logging_config)
fc::configure_logging(*logging_config); fc::configure_logging(*logging_config);
} }
catch (const fc::exception&)
{
wlog("Error parsing logging config from config file ${config}, using default config", ("config", config_ini_path.preferred_string()));
}
}
else else
{ {
ilog("Writing new config file at ${path}", ("path", config_ini_path)); ilog("Writing new config file at ${path}", ("path", config_ini_path));
@ -195,6 +203,8 @@ void write_default_logging_config_to_stream(std::ostream& out)
fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path& config_ini_filename) fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path& config_ini_filename)
{ {
try
{
fc::logging_config logging_config; fc::logging_config logging_config;
bool found_logging_config = false; bool found_logging_config = false;
@ -267,4 +277,6 @@ fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::pat
return logging_config; return logging_config;
else else
return fc::optional<fc::logging_config>(); return fc::optional<fc::logging_config>();
}
FC_RETHROW_EXCEPTIONS(warn, "")
} }