diff options
| author | David Winter <david.winter@analog.com> | 2021-06-28 10:47:53 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-07-02 14:05:04 -0400 |
| commit | 9fdf5dc7a3187533f4db27fbdee665d89c5f8f6f (patch) | |
| tree | 58080578a03e71983a795dbc30ad3edad620b509 /gr-fec/lib | |
| parent | 7defc495695f17760ed14a197e7bade8c34691a5 (diff) | |
fec: generic_{en,de}coder: Use logger_get_configured_logger helper
This commit uses the new logger_get_configured_logger helper to
replace the duplicated logger retrieval code in the constructor of
generic_decoder and generic_encoder.
Signed-off-by: David Winter <david.winter@analog.com>
Diffstat (limited to 'gr-fec/lib')
| -rw-r--r-- | gr-fec/lib/generic_decoder.cc | 23 | ||||
| -rw-r--r-- | gr-fec/lib/generic_encoder.cc | 23 |
2 files changed, 2 insertions, 44 deletions
diff --git a/gr-fec/lib/generic_decoder.cc b/gr-fec/lib/generic_decoder.cc index 767f6dbd96..0ce9cef751 100644 --- a/gr-fec/lib/generic_decoder.cc +++ b/gr-fec/lib/generic_decoder.cc @@ -13,8 +13,6 @@ #endif #include <gnuradio/fec/generic_decoder.h> -#include <gnuradio/prefs.h> -#include <cstdio> namespace gr { namespace fec { @@ -24,26 +22,7 @@ generic_decoder::generic_decoder(std::string name) d_name = name; my_id = base_unique_id++; - prefs* p = prefs::singleton(); - std::string config_file = p->get_string("LOG", "log_config", ""); - std::string log_level = p->get_string("LOG", "log_level", "off"); - std::string log_file = p->get_string("LOG", "log_file", ""); - - GR_CONFIG_LOGGER(config_file); - - GR_LOG_GETLOGGER(LOG, "gr_log." + alias()); - GR_LOG_SET_LEVEL(LOG, log_level); - if (!log_file.empty()) { - if (log_file == "stdout") { - GR_LOG_SET_CONSOLE_APPENDER(LOG, "stdout", "gr::log :%p: %c{1} - %m%n"); - } else if (log_file == "stderr") { - GR_LOG_SET_CONSOLE_APPENDER(LOG, "stderr", "gr::log :%p: %c{1} - %m%n"); - } else { - GR_LOG_SET_FILE_APPENDER(LOG, log_file, true, "%r :%p: %c{1} - %m%n"); - } - } - - d_logger = LOG; + GR_LOG_ASSIGN_CONFIGURED_LOGPTR(d_logger, alias()); } generic_decoder::~generic_decoder() {} diff --git a/gr-fec/lib/generic_encoder.cc b/gr-fec/lib/generic_encoder.cc index a6258218e1..3a25b9cdc4 100644 --- a/gr-fec/lib/generic_encoder.cc +++ b/gr-fec/lib/generic_encoder.cc @@ -13,8 +13,6 @@ #endif #include <gnuradio/fec/generic_encoder.h> -#include <gnuradio/prefs.h> -#include <cstdio> namespace gr { namespace fec { @@ -24,26 +22,7 @@ generic_encoder::generic_encoder(std::string name) d_name = name; my_id = base_unique_id++; - prefs* p = prefs::singleton(); - std::string config_file = p->get_string("LOG", "log_config", ""); - std::string log_level = p->get_string("LOG", "log_level", "off"); - std::string log_file = p->get_string("LOG", "log_file", ""); - - GR_CONFIG_LOGGER(config_file); - - GR_LOG_GETLOGGER(LOG, "gr_log." + alias()); - GR_LOG_SET_LEVEL(LOG, log_level); - if (!log_file.empty()) { - if (log_file == "stdout") { - GR_LOG_SET_CONSOLE_APPENDER(LOG, "stdout", "gr::log :%p: %c{1} - %m%n"); - } else if (log_file == "stderr") { - GR_LOG_SET_CONSOLE_APPENDER(LOG, "stderr", "gr::log :%p: %c{1} - %m%n"); - } else { - GR_LOG_SET_FILE_APPENDER(LOG, log_file, true, "%r :%p: %c{1} - %m%n"); - } - } - - d_logger = LOG; + GR_LOG_ASSIGN_CONFIGURED_LOGPTR(d_logger, alias()); } generic_encoder::~generic_encoder() {} |