Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Sighup logging #7547

Merged
merged 5 commits into from
Jun 28, 2019
Merged

Sighup logging #7547

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc7b087
Update to thread-safe fc logging config and appbase with sighup handl…
heifner Jun 27, 2019
edb2d45
Use new fc::logger::update to update logger
heifner Jun 27, 2019
c075ffc
Call new fc::log_config::initialize_appenders
heifner Jun 27, 2019
9e70ca3
Update to appbase with peer review fixes
heifner Jun 28, 2019
26f1ffc
Update to fc and appbase tips
heifner Jun 28, 2019
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
2 changes: 1 addition & 1 deletion libraries/appbase
Open in desktop
Submodule appbase updated 2 files
+22 −14 application.cpp
+2 −2 include/appbase/application.hpp
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 8 files
+0 −9 include/fc/log/appender.hpp
+5 −4 include/fc/log/logger.hpp
+32 −2 include/fc/log/logger_config.hpp
+3 −38 src/log/appender.cpp
+0 −3 src/log/console_appender.cpp
+0 −4 src/log/gelf_appender.cpp
+11 −20 src/log/logger.cpp
+51 −15 src/log/logger_config.cpp
8 changes: 1 addition & 7 deletions plugins/http_plugin/http_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
#include <memory>
#include <regex>

namespace fc {
extern std::unordered_map<std::string,logger>& get_logger_map();
}

const fc::string logger_name("http_plugin");
fc::logger logger;

Expand Down Expand Up @@ -637,9 +633,7 @@ namespace eosio {
}

void http_plugin::handle_sighup() {
if( fc::get_logger_map().find( logger_name ) != fc::get_logger_map().end() ) {
logger = fc::get_logger_map()[logger_name];
}
fc::logger::update( logger_name, logger );
}

void http_plugin::plugin_shutdown() {
Expand Down
7 changes: 1 addition & 6 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@

using namespace eosio::chain::plugin_interface;

namespace fc {
extern std::unordered_map<std::string,logger>& get_logger_map();
}

namespace eosio {
static appbase::abstract_plugin& _net_plugin = app().register_plugin<net_plugin>();

Expand Down Expand Up @@ -3341,8 +3337,7 @@ namespace eosio {
}

void net_plugin::handle_sighup() {
if(fc::get_logger_map().find(logger_name) != fc::get_logger_map().end())
logger = fc::get_logger_map()[logger_name];
fc::logger::update( logger_name, logger );
}

void net_plugin::plugin_shutdown() {
Expand Down
15 changes: 2 additions & 13 deletions plugins/producer_plugin/producer_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ using std::vector;
using std::deque;
using boost::signals2::scoped_connection;

// HACK TO EXPOSE LOGGER MAP

namespace fc {
extern std::unordered_map<std::string,logger>& get_logger_map();
}

const fc::string logger_name("producer_plugin");
fc::logger _log;

Expand Down Expand Up @@ -912,13 +906,8 @@ void producer_plugin::plugin_shutdown() {
}

void producer_plugin::handle_sighup() {
auto& logger_map = fc::get_logger_map();
if(logger_map.find(logger_name) != logger_map.end()) {
_log = logger_map[logger_name];
}
if( logger_map.find(trx_trace_logger_name) != logger_map.end()) {
_trx_trace_log = logger_map[trx_trace_logger_name];
}
fc::logger::update( logger_name, _log );
fc::logger::update( trx_trace_logger_name, _trx_trace_log );
}

void producer_plugin::pause() {
Expand Down
12 changes: 3 additions & 9 deletions programs/nodeos/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
using namespace appbase;
using namespace eosio;

namespace fc {
std::unordered_map<std::string,appender::ptr>& get_appender_map();
}

namespace detail {

void configure_logging(const bfs::path& config_path)
Expand All @@ -51,21 +47,19 @@ void configure_logging(const bfs::path& config_path)

void logging_conf_handler()
{
ilog("Received HUP. Reloading logging configuration.");
auto config_path = app().get_logging_conf();
ilog("Received HUP. Reloading logging configuration from ${p}.", ("p", config_path.string()));
if(fc::exists(config_path))
::detail::configure_logging(config_path);
for(auto iter : fc::get_appender_map())
iter.second->initialize(app().get_io_service());
fc::log_config::initialize_appenders( app().get_io_service() );
}

void initialize_logging()
{
auto config_path = app().get_logging_conf();
if(fc::exists(config_path))
fc::configure_logging(config_path); // intentionally allowing exceptions to escape
for(auto iter : fc::get_appender_map())
iter.second->initialize(app().get_io_service());
fc::log_config::initialize_appenders( app().get_io_service() );

app().set_sighup_callback(logging_conf_handler);
}
Expand Down