move configuration of default logger to main

this prevents the case where a layer requests a new log_filter
before the default logger has been configured
This commit is contained in:
Andre Puschmann 2020-01-29 17:08:52 +01:00
parent 5302fcfa4d
commit bbacc35e24
5 changed files with 7 additions and 8 deletions

View File

@ -21,6 +21,8 @@
#include "logger.h"
#include "singleton.h"
#include "srslte/common/log_filter.h"
#include "srslte/common/logger_stdout.h"
#include <mutex>
#include <unordered_map>

View File

@ -33,6 +33,7 @@
#include "srslte/common/config_file.h"
#include "srslte/common/crash_handler.h"
#include "srslte/common/logmap.h"
#include "srslte/common/metrics_hub.h"
#include "srslte/srslte.h"
#include "srslte/version.h"
@ -571,6 +572,7 @@ int main(int argc, char* argv[])
logger_file.init(args.log.filename, args.log.file_max_size);
logger = &logger_file;
}
srslte::logmap::get_instance()->set_default_logger(logger);
// Create UE instance
srsue::ue ue;

View File

@ -83,7 +83,6 @@ int ue_stack_lte::init(const stack_args_t& args_, srslte::logger* logger_)
logger = logger_;
// setup logging for each layer
logmap::get_instance()->set_default_logger(logger);
mac_log.init("MAC ", logger, true);
rlc_log.init("RLC ", logger);
pdcp_log.init("PDCP", logger);

View File

@ -51,7 +51,7 @@ std::string get_filename_with_tc_name(const std::string& str, const uint32_t run
result.push_back(start);
// prepend TC name to last element (the actual filename)
stringstream filename_ss;
std::stringstream filename_ss;
filename_ss << tc_name << "_"
<< "run" << run_id << "_" << result.back();

View File

@ -22,18 +22,13 @@
#include "rapidjson/document.h" // rapidjson's DOM-style API
#include "rapidjson/prettywriter.h" // for stringify JSON
#include "srslte/build_info.h"
#include "srslte/common/log_filter.h"
#include "srslte/common/logger_stdout.h"
#include "srslte/common/logmap.h"
#include "srsue/hdr/ue.h"
#include "ttcn3_helpers.h"
#include "ttcn3_syssim.h"
#include <assert.h>
#include <boost/program_options.hpp>
#include <boost/program_options/parsers.hpp>
#include <iostream>
#include <pthread.h>
#include <signal.h>
#include <srslte/interfaces/ue_interfaces.h>
using namespace srslte;
using namespace srsue;
@ -138,6 +133,7 @@ int main(int argc, char** argv)
// Instantiate file logger
srslte::logger_file logger_file;
srslte::logmap::get_instance()->set_default_logger(&logger_file);
// create and init SYSSIM
ttcn3_syssim syssim(&logger_file);