diff --git a/include/dsn/c/api_utilities.h b/include/dsn/c/api_utilities.h index 1f5a233c15..53fff2b383 100644 --- a/include/dsn/c/api_utilities.h +++ b/include/dsn/c/api_utilities.h @@ -37,82 +37,7 @@ #include #include - -/*! -@defgroup logging Logging Service -@ingroup service-api-utilities - - Logging Service - - Note developers can plug into rDSN their own logging libraryS - implementation, so as to integrate rDSN logs into - their own cluster operation systems. -@{ -*/ - -typedef enum dsn_log_level_t { - LOG_LEVEL_INFORMATION, - LOG_LEVEL_DEBUG, - LOG_LEVEL_WARNING, - LOG_LEVEL_ERROR, - LOG_LEVEL_FATAL, - LOG_LEVEL_COUNT, - LOG_LEVEL_INVALID -} dsn_log_level_t; - -// logs with level smaller than this start_level will not be logged -extern DSN_API dsn_log_level_t dsn_log_start_level; -extern DSN_API dsn_log_level_t dsn_log_get_start_level(); -extern DSN_API void dsn_log_set_start_level(dsn_log_level_t level); -extern DSN_API void dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args); -extern DSN_API void dsn_logf(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - ...); -extern DSN_API void -dsn_log(const char *file, const char *function, const int line, dsn_log_level_t log_level); -extern DSN_API void dsn_coredump(); - -// __FILENAME__ macro comes from the cmake, in which we calculate a filename without path. -#define dlog(level, ...) \ - do { \ - if (level >= dsn_log_start_level) \ - dsn_logf(__FILENAME__, __FUNCTION__, __LINE__, level, __VA_ARGS__); \ - } while (false) -#define dinfo(...) dlog(LOG_LEVEL_INFORMATION, __VA_ARGS__) -#define ddebug(...) dlog(LOG_LEVEL_DEBUG, __VA_ARGS__) -#define dwarn(...) dlog(LOG_LEVEL_WARNING, __VA_ARGS__) -#define derror(...) dlog(LOG_LEVEL_ERROR, __VA_ARGS__) -#define dfatal(...) dlog(LOG_LEVEL_FATAL, __VA_ARGS__) -#define dassert(x, ...) \ - do { \ - if (dsn_unlikely(!(x))) { \ - dlog(LOG_LEVEL_FATAL, "assertion expression: " #x); \ - dlog(LOG_LEVEL_FATAL, __VA_ARGS__); \ - dsn_coredump(); \ - } \ - } while (false) - -#define dreturn_not_ok_logged(err, ...) \ - do { \ - if ((err) != dsn::ERR_OK) { \ - derror(__VA_ARGS__); \ - return err; \ - } \ - } while (0) - -#ifndef NDEBUG -#define dbg_dassert dassert -#else -#define dbg_dassert(x, ...) -#endif +#include #ifdef DSN_MOCK_TEST #define mock_private public diff --git a/include/dsn/tool-api/global_config.h b/include/dsn/tool-api/global_config.h index 0942a9540b..e623f685e3 100644 --- a/include/dsn/tool-api/global_config.h +++ b/include/dsn/tool-api/global_config.h @@ -159,7 +159,6 @@ struct service_spec std::string rwlock_nr_factory_name; std::string semaphore_factory_name; std::string nfs_factory_name; - std::string logging_factory_name; std::list network_aspects; // toollets compatible to the above network main // providers in network configs @@ -180,7 +179,6 @@ struct service_spec // auto-set std::string dir_coredump; - std::string dir_log; service_spec() {} DSN_API bool init(); @@ -208,7 +206,6 @@ CONFIG_FLD_STRING(lock_nr_factory_name, "", "non-recurisve exclusive lock provid CONFIG_FLD_STRING(rwlock_nr_factory_name, "", "non-recurisve rwlock provider") CONFIG_FLD_STRING(semaphore_factory_name, "", "semaphore provider") CONFIG_FLD_STRING(nfs_factory_name, "", "nfs provider") -CONFIG_FLD_STRING(logging_factory_name, "", "logging provider") CONFIG_FLD_STRING_LIST(network_aspects, "network aspect providers, usually for tooling purpose") CONFIG_FLD_STRING_LIST(aio_aspects, "aio aspect providers, usually for tooling purpose") diff --git a/include/dsn/tool-api/task_spec.h b/include/dsn/tool-api/task_spec.h index 2aa78b1e42..9ab3cc6b21 100644 --- a/include/dsn/tool-api/task_spec.h +++ b/include/dsn/tool-api/task_spec.h @@ -47,14 +47,6 @@ #include #include -ENUM_BEGIN(dsn_log_level_t, LOG_LEVEL_INVALID) -ENUM_REG(LOG_LEVEL_INFORMATION) -ENUM_REG(LOG_LEVEL_DEBUG) -ENUM_REG(LOG_LEVEL_WARNING) -ENUM_REG(LOG_LEVEL_ERROR) -ENUM_REG(LOG_LEVEL_FATAL) -ENUM_END(dsn_log_level_t) - namespace dsn { enum task_state diff --git a/include/dsn/tool_api.h b/include/dsn/tool_api.h index 00928da8da..24d13fb070 100644 --- a/include/dsn/tool_api.h +++ b/include/dsn/tool_api.h @@ -60,7 +60,7 @@ Component providers define the interface for the local components (e.g., network #include #include #include -#include +#include #include namespace dsn { @@ -143,9 +143,6 @@ DSN_API bool register_component_provider(const char *name, aio_provider::factory f, ::dsn::provider_type type); DSN_API bool register_component_provider(const char *name, env_provider::factory f, ::dsn::provider_type type); -DSN_API bool register_component_provider(const char *name, - logging_provider::factory f, - ::dsn::provider_type type); DSN_API bool register_component_provider(network_header_format fmt, const std::vector &signatures, message_parser::factory f, diff --git a/include/dsn/utility/logging.h b/include/dsn/utility/logging.h new file mode 100644 index 0000000000..44d6ddb766 --- /dev/null +++ b/include/dsn/utility/logging.h @@ -0,0 +1,122 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2015 Microsoft Corporation + * + * -=- Robust Distributed System Nucleus (rDSN) -=- + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include +#include + +namespace dsn { + +enum log_level_t +{ + LOG_LEVEL_INFORMATION, + LOG_LEVEL_DEBUG, + LOG_LEVEL_WARNING, + LOG_LEVEL_ERROR, + LOG_LEVEL_FATAL, + LOG_LEVEL_COUNT, + LOG_LEVEL_INVALID +}; + +ENUM_BEGIN(log_level_t, LOG_LEVEL_INVALID) +ENUM_REG(LOG_LEVEL_INFORMATION) +ENUM_REG(LOG_LEVEL_DEBUG) +ENUM_REG(LOG_LEVEL_WARNING) +ENUM_REG(LOG_LEVEL_ERROR) +ENUM_REG(LOG_LEVEL_FATAL) +ENUM_END(log_level_t) + +// logs with level smaller than `s_log_start_level` will not be logged +extern log_level_t s_log_start_level; + +/// An interface for logging messages. +class logging_provider +{ +public: + virtual ~logging_provider() = default; + + virtual void logv(const char *file, + const char *function, + int line, + log_level_t log_level, + const char *fmt, + va_list args) = 0; + + virtual void flush() = 0; +}; + +/// Initializes default logger for rDSN. +extern void logging_init(const char *log_dir); + +/// Customize the logging implementation. +extern void set_logging_provider(std::unique_ptr provider); + +} // namespace dsn + +extern void dsn_logf(const char *file, + const char *function, + int line, + dsn::log_level_t log_level, + const char *fmt, + ...); + +extern void dsn_coredump(); + +// __FILENAME__ macro comes from the cmake, in which we calculate a filename without path. +#define dlog(level, ...) \ + do { \ + if (level >= dsn::s_log_start_level) \ + dsn_logf(__FILENAME__, __FUNCTION__, __LINE__, level, __VA_ARGS__); \ + } while (false) + +#define dinfo(...) dlog(dsn::LOG_LEVEL_INFORMATION, __VA_ARGS__) +#define ddebug(...) dlog(dsn::LOG_LEVEL_DEBUG, __VA_ARGS__) +#define dwarn(...) dlog(dsn::LOG_LEVEL_WARNING, __VA_ARGS__) +#define derror(...) dlog(dsn::LOG_LEVEL_ERROR, __VA_ARGS__) +#define dfatal(...) dlog(dsn::LOG_LEVEL_FATAL, __VA_ARGS__) +#define dassert(x, ...) \ + do { \ + if (dsn_unlikely(!(x))) { \ + dlog(dsn::LOG_LEVEL_FATAL, "assertion expression: " #x); \ + dlog(dsn::LOG_LEVEL_FATAL, __VA_ARGS__); \ + dsn_coredump(); \ + } \ + } while (false) + +#define dreturn_not_ok_logged(err, ...) \ + do { \ + if ((err) != dsn::ERR_OK) { \ + derror(__VA_ARGS__); \ + return err; \ + } \ + } while (0) + +#ifndef NDEBUG +#define dbg_dassert dassert +#else +#define dbg_dassert(x, ...) +#endif diff --git a/src/core/core/coredump.posix.cpp b/src/core/core/coredump.posix.cpp index d46fc06f85..7ca2e8a944 100644 --- a/src/core/core/coredump.posix.cpp +++ b/src/core/core/coredump.posix.cpp @@ -39,6 +39,7 @@ #include #include #include +#include namespace dsn { namespace utils { diff --git a/src/core/core/logging.cpp b/src/core/core/logging.cpp index b6ee0721bf..6ee992f456 100644 --- a/src/core/core/logging.cpp +++ b/src/core/core/logging.cpp @@ -24,104 +24,94 @@ * THE SOFTWARE. */ -/* - * Description: - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - #include #include -#include +#include +#include #include -#include "service_engine.h" #include -DSN_API dsn_log_level_t dsn_log_start_level = dsn_log_level_t::LOG_LEVEL_INFORMATION; +#include "logging_impl.h" + +namespace dsn { -static void log_on_sys_exit(::dsn::sys_exit_type) +static std::unique_ptr s_logging_provider; + +static void log_on_sys_exit(sys_exit_type) { - ::dsn::logging_provider *logger = ::dsn::service_engine::instance().logging(); + logging_provider *logger = s_logging_provider.get(); if (logger != nullptr) { logger->flush(); } } -void dsn_log_init() +/*extern*/ log_level_t s_log_start_level = LOG_LEVEL_INVALID; + +/*extern*/ void logging_init(const char *log_dir) { - dsn_log_start_level = enum_from_string( + s_logging_provider = dsn::make_unique(log_dir); + + // initialize logging start level + log_level_t log_start_level = enum_from_string( dsn_config_get_value_string("core", "logging_start_level", - enum_to_string(dsn_log_start_level), + enum_to_string(LOG_LEVEL_INFORMATION), "logs with level below this will not be logged"), - dsn_log_level_t::LOG_LEVEL_INVALID); - - dassert(dsn_log_start_level != dsn_log_level_t::LOG_LEVEL_INVALID, + log_level_t::LOG_LEVEL_INVALID); + dassert(log_start_level != log_level_t::LOG_LEVEL_INVALID, "invalid [core] logging_start_level specified"); + s_log_start_level = log_start_level; // register log flush on exit bool logging_flush_on_exit = dsn_config_get_value_bool( "core", "logging_flush_on_exit", true, "flush log when exit system"); if (logging_flush_on_exit) { - ::dsn::tools::sys_exit.put_back(log_on_sys_exit, "log.flush"); + tools::sys_exit.put_back(log_on_sys_exit, "log.flush"); } // register command for logging - ::dsn::command_manager::instance().register_command( - {"flush-log"}, - "flush-log - flush log to stderr or log file", - "flush-log", - [](const std::vector &args) { - ::dsn::logging_provider *logger = ::dsn::service_engine::instance().logging(); - if (logger != nullptr) { - logger->flush(); - } - return "Flush done."; - }); - ::dsn::command_manager::instance().register_command( + command_manager::instance().register_command( {"reset-log-start-level"}, "reset-log-start-level - reset the log start level", "reset-log-start-level [INFORMATION | DEBUG | WARNING | ERROR | FATAL]", [](const std::vector &args) { - dsn_log_level_t start_level; - if (args.size() == 0) { + log_level_t start_level; + if (args.empty()) { start_level = enum_from_string( dsn_config_get_value_string("core", "logging_start_level", - enum_to_string(dsn_log_start_level), + enum_to_string(s_log_start_level), "logs with level below this will not be logged"), - dsn_log_level_t::LOG_LEVEL_INVALID); + log_level_t::LOG_LEVEL_INVALID); } else { std::string level_str = "LOG_LEVEL_" + args[0]; - start_level = - enum_from_string(level_str.c_str(), dsn_log_level_t::LOG_LEVEL_INVALID); - if (start_level == dsn_log_level_t::LOG_LEVEL_INVALID) { + start_level = enum_from_string(level_str.c_str(), log_level_t::LOG_LEVEL_INVALID); + if (start_level == log_level_t::LOG_LEVEL_INVALID) { return "ERROR: invalid level '" + args[0] + "'"; } } - dsn_log_set_start_level(start_level); + s_log_start_level = start_level; return std::string("OK, current level is ") + enum_to_string(start_level); }); } -DSN_API dsn_log_level_t dsn_log_get_start_level() { return dsn_log_start_level; } +/*extern*/ void set_logging_provider(std::unique_ptr provider) +{ + s_logging_provider = std::move(provider); +} -DSN_API void dsn_log_set_start_level(dsn_log_level_t level) { dsn_log_start_level = level; } +} // namespace dsn -DSN_API void dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args) +static void dsn_logv(const char *file, + const char *function, + const int line, + dsn::log_level_t log_level, + const char *fmt, + va_list args) { - ::dsn::logging_provider *logger = ::dsn::service_engine::instance().logging(); + dsn::logging_provider *logger = dsn::s_logging_provider.get(); if (logger != nullptr) { - logger->dsn_logv(file, function, line, log_level, fmt, args); + logger->logv(file, function, line, log_level, fmt, args); } else { printf("%s:%d:%s():", file, line, function); vprintf(fmt, args); @@ -129,21 +119,15 @@ DSN_API void dsn_logv(const char *file, } } -DSN_API void dsn_logf(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - ...) +/*extern*/ void dsn_logf(const char *file, + const char *function, + const int line, + dsn::log_level_t log_level, + const char *fmt, + ...) { va_list ap; va_start(ap, fmt); dsn_logv(file, function, line, log_level, fmt, ap); va_end(ap); } - -DSN_API void -dsn_log(const char *file, const char *function, const int line, dsn_log_level_t log_level) -{ - dsn_logf(file, function, line, log_level, ""); -} diff --git a/src/core/tools/common/simple_logger.cpp b/src/core/core/logging_impl.cpp similarity index 74% rename from src/core/tools/common/simple_logger.cpp rename to src/core/core/logging_impl.cpp index 21fcb3f493..d7cfcbe53b 100644 --- a/src/core/tools/common/simple_logger.cpp +++ b/src/core/core/logging_impl.cpp @@ -24,34 +24,26 @@ * THE SOFTWARE. */ -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ +#include "logging_impl.h" -#include "simple_logger.h" #include #include +#include namespace dsn { -namespace tools { -static void print_header(FILE *fp, dsn_log_level_t log_level) +static void print_header(FILE *fp, log_level_t log_level) { static char s_level_char[] = "IDWEF"; uint64_t ts = 0; - if (::dsn::tools::is_engine_ready()) + if (tools::is_engine_ready()) ts = dsn_now_ns(); char str[24]; - ::dsn::utils::time_ms_to_string(ts / 1000000, str); + utils::time_ms_to_string(ts / 1000000, str); - int tid = ::dsn::utils::get_current_tid(); + int tid = utils::get_current_tid(); fprintf(fp, "%c%s (%" PRIu64 " %04x) ", s_level_char[log_level], str, ts, tid); @@ -85,39 +77,12 @@ static void print_header(FILE *fp, dsn_log_level_t log_level) } } -screen_logger::screen_logger(const char *log_dir) : logging_provider(log_dir) -{ - _short_header = - dsn_config_get_value_bool("tools.screen_logger", - "short_header", - true, - "whether to use short header (excluding file/function etc.)"); -} - -screen_logger::~screen_logger(void) {} - -void screen_logger::dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args) -{ - utils::auto_lock<::dsn::utils::ex_lock_nr> l(_lock); - - print_header(stdout, log_level); - if (!_short_header) { - printf("%s:%d:%s(): ", file, line, function); - } - vprintf(fmt, args); - printf("\n"); -} - -void screen_logger::flush() { ::fflush(stdout); } - -simple_logger::simple_logger(const char *log_dir) : logging_provider(log_dir) +simple_logger::simple_logger(const char *log_dir) { + // setup log dir _log_dir = std::string(log_dir); + utils::filesystem::create_directory(_log_dir); + // we assume all valid entries are positive _start_index = 0; _index = 1; @@ -148,11 +113,11 @@ simple_logger::simple_logger(const char *log_dir) : logging_provider(log_dir) // check existing log files std::vector sub_list; - if (!dsn::utils::filesystem::get_subfiles(_log_dir, sub_list, false)) { + if (!utils::filesystem::get_subfiles(_log_dir, sub_list, false)) { dassert(false, "Fail to get subfiles in %s.", _log_dir.c_str()); } for (auto &fpath : sub_list) { - auto &&name = dsn::utils::filesystem::get_file_name(fpath); + auto &&name = utils::filesystem::get_file_name(fpath); if (name.length() <= 8 || name.substr(0, 4) != "log.") continue; @@ -201,32 +166,32 @@ void simple_logger::create_log_file() } } -simple_logger::~simple_logger(void) +simple_logger::~simple_logger() { - utils::auto_lock<::dsn::utils::ex_lock> l(_lock); + utils::auto_lock l(_lock); ::fclose(_log); } void simple_logger::flush() { - utils::auto_lock<::dsn::utils::ex_lock> l(_lock); + utils::auto_lock l(_lock); ::fflush(_log); ::fflush(stdout); } -void simple_logger::dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args) +void simple_logger::logv(const char *file, + const char *function, + const int line, + log_level_t log_level, + const char *fmt, + va_list args) { va_list args2; if (log_level >= _stderr_start_level) { va_copy(args2, args); } - utils::auto_lock<::dsn::utils::ex_lock> l(_lock); + utils::auto_lock l(_lock); print_header(_log, log_level); if (!_short_header) { @@ -251,5 +216,5 @@ void simple_logger::dsn_logv(const char *file, create_log_file(); } } -} -} + +} // namespace dsn diff --git a/include/dsn/tool-api/logging_provider.h b/src/core/core/logging_impl.h similarity index 56% rename from include/dsn/tool-api/logging_provider.h rename to src/core/core/logging_impl.h index d4d0e3057f..5d151e98a3 100644 --- a/include/dsn/tool-api/logging_provider.h +++ b/src/core/core/logging_impl.h @@ -24,52 +24,47 @@ * THE SOFTWARE. */ -/* - * Description: - * base prototype for logging - * - * Revision history: - * Mar., 2015, @imzhenyu (Zhenyu Guo), first version - * xxxx-xx-xx, author, fix bug about xxx - */ - #pragma once -#include -#include +#include +#include + +#include +#include namespace dsn { -/*! -@addtogroup tool-api-providers -@{ -*/ -class logging_provider +class simple_logger : public logging_provider { public: - template - static logging_provider *create(const char *log_dir) - { - return new T(log_dir); - } + explicit simple_logger(const char *log_dir); - typedef logging_provider *(*factory)(const char *); + ~simple_logger() override; -public: - logging_provider(const char *) {} + void logv(const char *file, + const char *function, + int line, + log_level_t log_level, + const char *fmt, + va_list args) override; - virtual ~logging_provider(void) {} + void flush() override; - virtual void dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args) = 0; +private: + void create_log_file(); - virtual void flush() = 0; +private: + std::string _log_dir; + utils::ex_lock _lock; // use recursive lock to avoid dead lock when flush() is called + // in signal handler if cored for bad logging format reason. + FILE *_log; + int _start_index; + int _index; + int _lines; + bool _short_header; + bool _fast_flush; + log_level_t _stderr_start_level; + int _max_number_of_log_files_on_disk; }; -/*@}*/ -// ----------------------- inline implementation --------------------------------------- -} // end namespace +} // namespace dsn diff --git a/src/core/core/service_api_c.cpp b/src/core/core/service_api_c.cpp index f9c7d1dfd4..4ea7c7a308 100644 --- a/src/core/core/service_api_c.cpp +++ b/src/core/core/service_api_c.cpp @@ -283,7 +283,6 @@ tool_app *get_current_tool() { return dsn_all.tool.get(); } } // namespace tools } // namespace dsn -extern void dsn_log_init(); extern void dsn_core_init(); inline void dsn_global_init() @@ -358,10 +357,6 @@ bool run(const char *config_file, dsn::utils::filesystem::create_directory(spec.dir_coredump); ::dsn::utils::coredump::init(spec.dir_coredump.c_str()); - // setup log dir - spec.dir_log = ::dsn::utils::filesystem::path_combine(cdir, "log"); - dsn::utils::filesystem::create_directory(spec.dir_log); - // init tools dsn_all.tool.reset(::dsn::utils::factory_store<::dsn::tools::tool_app>::create( spec.tool.c_str(), ::dsn::PROVIDER_TYPE_MAIN, spec.tool.c_str())); @@ -385,7 +380,8 @@ bool run(const char *config_file, ::dsn::service_engine::instance().init_before_toollets(spec); // init logging - dsn_log_init(); + std::string log_dir = ::dsn::utils::filesystem::path_combine(cdir, "log"); + dsn::logging_init(log_dir.c_str()); ddebug("process(%ld) start: %" PRIu64 ", date: %s", getpid(), diff --git a/src/core/core/service_engine.cpp b/src/core/core/service_engine.cpp index e540d99d2f..009ab7c2a7 100644 --- a/src/core/core/service_engine.cpp +++ b/src/core/core/service_engine.cpp @@ -218,10 +218,6 @@ void service_engine::init_before_toollets(const service_spec &spec) { _spec = spec; - // init common providers (first half) - _logging.reset(factory_store::create( - spec.logging_factory_name.c_str(), ::dsn::PROVIDER_TYPE_MAIN, spec.dir_log.c_str())); - // init common for all per-node providers message_ex::s_local_hash = (uint32_t)dsn_config_get_value_uint64("core", diff --git a/src/core/core/service_engine.h b/src/core/core/service_engine.h index f14eba13ac..8dc0d5f5a1 100644 --- a/src/core/core/service_engine.h +++ b/src/core/core/service_engine.h @@ -128,7 +128,6 @@ class service_engine : public utils::singleton // ServiceMode Mode() const { return _spec.Mode; } const service_spec &spec() const { return _spec; } env_provider *env() const { return _env; } - logging_provider *logging() const { return _logging.get(); } static std::string get_runtime_info(const std::vector &args); static std::string get_queue_info(const std::vector &args); @@ -141,7 +140,6 @@ class service_engine : public utils::singleton private: service_spec _spec; env_provider *_env; - std::unique_ptr _logging; // typedef std::map diff --git a/src/core/core/tool_api.cpp b/src/core/core/tool_api.cpp index f216352308..334f517730 100644 --- a/src/core/core/tool_api.cpp +++ b/src/core/core/tool_api.cpp @@ -163,13 +163,6 @@ bool register_component_provider(const char *name, return dsn::utils::factory_store::register_factory(name, f, type); } -bool register_component_provider(const char *name, - logging_provider::factory f, - ::dsn::provider_type type) -{ - return dsn::utils::factory_store::register_factory(name, f, type); -} - bool register_component_provider(network_header_format fmt, const std::vector &signatures, message_parser::factory f, diff --git a/src/core/tests/config-test-corrupt-message.ini b/src/core/tests/config-test-corrupt-message.ini index 8ba0f42dd2..6d167bb469 100644 --- a/src/core/tests/config-test-corrupt-message.ini +++ b/src/core/tests/config-test-corrupt-message.ini @@ -35,7 +35,6 @@ toollets = fault_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger io_worker_count = 1 diff --git a/src/core/tests/config-test-posix-aio.ini b/src/core/tests/config-test-posix-aio.ini index 349bc11133..2bf14eff2d 100644 --- a/src/core/tests/config-test-posix-aio.ini +++ b/src/core/tests/config-test-posix-aio.ini @@ -22,7 +22,6 @@ toollets = tracer, profiler pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger aio_factory_name = dsn::tools::posix_aio_provider diff --git a/src/core/tests/config-test-sim.ini b/src/core/tests/config-test-sim.ini index b04bc7ed60..be08b12cec 100644 --- a/src/core/tests/config-test-sim.ini +++ b/src/core/tests/config-test-sim.ini @@ -38,7 +38,6 @@ toollets = tracer, profiler pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger disk_io_mode = IOE_PER_QUEUE ;rpc_io_mode = IOE_PER_QUEUE diff --git a/src/core/tests/config-test.ini b/src/core/tests/config-test.ini index 6b449cce90..51a0685e78 100644 --- a/src/core/tests/config-test.ini +++ b/src/core/tests/config-test.ini @@ -51,7 +51,6 @@ toollets = tracer, profiler pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger io_worker_count = 1 diff --git a/src/core/tests/logging.cpp b/src/core/tests/logging.cpp deleted file mode 100644 index af5a0b5a56..0000000000 --- a/src/core/tests/logging.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * Unit-test for logging. - * - * Revision history: - * Nov., 2015, @qinzuoyan (Zuoyan Qin), first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#include -#include -#include - -TEST(core, logging) -{ - dsn_log_level_t level = dsn_log_get_start_level(); - std::cout << "logging start level = " << level << std::endl; - dsn_logf(__FILENAME__, - __FUNCTION__, - __LINE__, - dsn_log_level_t::LOG_LEVEL_DEBUG, - "in TEST(core, logging)"); - dsn_log(__FILENAME__, __FUNCTION__, __LINE__, dsn_log_level_t::LOG_LEVEL_DEBUG); -} - -TEST(core, logging_big_log) -{ - std::string big_str(128000, 'x'); - dsn_logf(__FILENAME__, - __FUNCTION__, - __LINE__, - dsn_log_level_t::LOG_LEVEL_DEBUG, - "write big str %s", - big_str.c_str()); -} diff --git a/src/core/tests/logger.cpp b/src/core/tests/logging_test.cpp similarity index 86% rename from src/core/tests/logger.cpp rename to src/core/tests/logging_test.cpp index bff7a9e07e..02f887327b 100644 --- a/src/core/tests/logger.cpp +++ b/src/core/tests/logging_test.cpp @@ -33,12 +33,11 @@ * xxxx-xx-xx, author, fix bug about xxx */ -#include "../tools/common/simple_logger.h" +#include "core/core/logging_impl.h" #include #include using namespace dsn; -using namespace dsn::tools; static const int simple_logger_gc_gap = 20; @@ -90,26 +89,12 @@ void log_print(logging_provider *logger, const char *fmt, ...) { va_list vl; va_start(vl, fmt); - logger->dsn_logv(__FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_INFORMATION, fmt, vl); + logger->logv(__FILE__, __FUNCTION__, __LINE__, LOG_LEVEL_INFORMATION, fmt, vl); va_end(vl); } TEST(tools_common, simple_logger) { - // cases for print_header - screen_logger *logger = new screen_logger("./"); - log_print(logger, "%s", "test_print"); - std::thread t( - [](screen_logger *lg) { - tls_dsn.magic = 0xdeadbeef; - log_print(lg, "%s", "test_print"); - }, - logger); - t.join(); - - logger->flush(); - delete logger; - prepare_test_dir(); // create multiple files for (unsigned int i = 0; i < simple_logger_gc_gap + 10; ++i) { @@ -130,3 +115,14 @@ TEST(tools_common, simple_logger) clear_files(index); finish_test_dir(); } + +TEST(core, logging_big_log) +{ + std::string big_str(128000, 'x'); + dsn_logf(__FILENAME__, + __FUNCTION__, + __LINE__, + log_level_t::LOG_LEVEL_DEBUG, + "write big str %s", + big_str.c_str()); +} diff --git a/src/core/tests/nfs_test_file1 b/src/core/tests/nfs_test_file1 index 7bf1621691..c054f08819 100644 --- a/src/core/tests/nfs_test_file1 +++ b/src/core/tests/nfs_test_file1 @@ -56,7 +56,6 @@ cli_local = true cli_remote = true logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger io_worker_count = 1 diff --git a/src/core/tests/nfs_test_file2 b/src/core/tests/nfs_test_file2 index 468947af67..417ecc4c4d 100644 --- a/src/core/tests/nfs_test_file2 +++ b/src/core/tests/nfs_test_file2 @@ -43,7 +43,6 @@ cli_local = true cli_remote = true logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger disk_io_mode = IOE_PER_QUEUE ;rpc_io_mode = IOE_PER_QUEUE diff --git a/src/core/tools/common/nativerun.cpp b/src/core/tools/common/nativerun.cpp index 30dbbd696a..a98f0d7bd2 100644 --- a/src/core/tools/common/nativerun.cpp +++ b/src/core/tools/common/nativerun.cpp @@ -78,9 +78,6 @@ void nativerun::install(service_spec &spec) spec.network_default_server_cfs[cs2] = cs2; } - if (spec.logging_factory_name == "") - spec.logging_factory_name = "dsn::tools::simple_logger"; - if (spec.lock_factory_name == "") spec.lock_factory_name = ("dsn::tools::std_lock_provider"); diff --git a/src/core/tools/common/providers.common.cpp b/src/core/tools/common/providers.common.cpp index 61341a8b14..d4644034b6 100644 --- a/src/core/tools/common/providers.common.cpp +++ b/src/core/tools/common/providers.common.cpp @@ -40,7 +40,6 @@ #include "native_aio_provider.linux.h" #include "simple_task_queue.h" #include "network.sim.h" -#include "simple_logger.h" #include "empty_aio_provider.h" #include "dsn_message_parser.h" #include "thrift_message_parser.h" @@ -52,8 +51,6 @@ void register_common_providers() { register_component_provider("dsn::env_provider"); register_component_provider("dsn::task_worker"); - register_component_provider("dsn::tools::screen_logger"); - register_component_provider("dsn::tools::simple_logger"); register_std_lock_providers(); diff --git a/src/core/tools/common/simple_logger.h b/src/core/tools/common/simple_logger.h deleted file mode 100644 index 346ddb81bd..0000000000 --- a/src/core/tools/common/simple_logger.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#pragma once - -#include -#include -#include - -namespace dsn { -namespace tools { - -class screen_logger : public logging_provider -{ -public: - screen_logger(const char *log_dir); - virtual ~screen_logger(void); - - virtual void dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args); - - virtual void flush(); - -private: - ::dsn::utils::ex_lock_nr _lock; - bool _short_header; -}; - -class simple_logger : public logging_provider -{ -public: - simple_logger(const char *log_dir); - virtual ~simple_logger(void); - - virtual void dsn_logv(const char *file, - const char *function, - const int line, - dsn_log_level_t log_level, - const char *fmt, - va_list args); - - virtual void flush(); - -private: - void create_log_file(); - -private: - std::string _log_dir; - ::dsn::utils::ex_lock _lock; // use recursive lock to avoid dead lock when flush() is called - // in signal handler if cored for bad logging format reason. - FILE *_log; - int _start_index; - int _index; - int _lines; - bool _short_header; - bool _fast_flush; - dsn_log_level_t _stderr_start_level; - int _max_number_of_log_files_on_disk; -}; -} -} diff --git a/src/core/tools/simulator/simulator.cpp b/src/core/tools/simulator/simulator.cpp index 902a68a568..1230278c03 100644 --- a/src/core/tools/simulator/simulator.cpp +++ b/src/core/tools/simulator/simulator.cpp @@ -89,9 +89,6 @@ void simulator::install(service_spec &spec) cs2.channel = RPC_CHANNEL_UDP; spec.network_default_server_cfs[cs2] = cs2; - if (spec.logging_factory_name == "") - spec.logging_factory_name = "dsn::tools::simple_logger"; - if (spec.lock_factory_name == "") spec.lock_factory_name = ("dsn::tools::sim_lock_provider"); diff --git a/src/dist/nfs/test/config.ini b/src/dist/nfs/test/config.ini index d77d45c647..fe001f03c9 100644 --- a/src/dist/nfs/test/config.ini +++ b/src/dist/nfs/test/config.ini @@ -15,5 +15,4 @@ enable_default_app_mimic = true tool = nativerun pause_on_start = false logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger io_worker_count = 1 diff --git a/src/dist/nfs/test/nfs_test_file1 b/src/dist/nfs/test/nfs_test_file1 index 7bf1621691..c054f08819 100644 --- a/src/dist/nfs/test/nfs_test_file1 +++ b/src/dist/nfs/test/nfs_test_file1 @@ -56,7 +56,6 @@ cli_local = true cli_remote = true logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger io_worker_count = 1 diff --git a/src/dist/nfs/test/nfs_test_file2 b/src/dist/nfs/test/nfs_test_file2 index 468947af67..417ecc4c4d 100644 --- a/src/dist/nfs/test/nfs_test_file2 +++ b/src/dist/nfs/test/nfs_test_file2 @@ -43,7 +43,6 @@ cli_local = true cli_remote = true logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger disk_io_mode = IOE_PER_QUEUE ;rpc_io_mode = IOE_PER_QUEUE diff --git a/src/dist/replication/lib/replica_2pc.cpp b/src/dist/replication/lib/replica_2pc.cpp index 336f0012fe..a1e00af335 100644 --- a/src/dist/replication/lib/replica_2pc.cpp +++ b/src/dist/replication/lib/replica_2pc.cpp @@ -118,7 +118,7 @@ void replica::init_prepare(mutation_ptr &mu, bool reconciliation) uint8_t count = 0; mu->data.header.last_committed_decree = last_committed_decree(); - dsn_log_level_t level = LOG_LEVEL_INFORMATION; + log_level_t level = LOG_LEVEL_INFORMATION; if (mu->data.header.decree == invalid_decree) { mu->set_id(get_ballot(), _prepare_list->max_decree() + 1); // print a debug log if necessary diff --git a/src/dist/replication/storage_engine/simple_kv/config.ini b/src/dist/replication/storage_engine/simple_kv/config.ini index c537457638..0ef3e6a286 100644 --- a/src/dist/replication/storage_engine/simple_kv/config.ini +++ b/src/dist/replication/storage_engine/simple_kv/config.ini @@ -40,8 +40,6 @@ toollets = tracer, profiler, fault_injector pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING -;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simulator] diff --git a/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini b/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini index 84e2f0a17f..14dde96305 100644 --- a/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini +++ b/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini @@ -21,7 +21,6 @@ toollets = fault_injector pause_on_start = false logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger ;io_mode = IOE_PER_NODE io_mode = IOE_PER_QUEUE @@ -35,9 +34,6 @@ stderr_start_level = LOG_LEVEL_WARNING [tools.simulator] random_seed = 1465902258 -[tools.screen_logger] -short_header = false - [network] ; how many network threads for network library (used by asio) io_service_worker_count = 2 diff --git a/src/dist/replication/test/meta_test/unit_test/config-test.ini b/src/dist/replication/test/meta_test/unit_test/config-test.ini index fa0c71b5e6..b709982c2f 100644 --- a/src/dist/replication/test/meta_test/unit_test/config-test.ini +++ b/src/dist/replication/test/meta_test/unit_test/config-test.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger ;io_mode = IOE_PER_NODE io_mode = IOE_PER_QUEUE @@ -35,9 +34,6 @@ stderr_start_level = LOG_LEVEL_ERROR [tools.simulator] random_seed = 1465902258 -[tools.screen_logger] -short_header = false - [network] ; how many network threads for network library (used by asio) io_service_worker_count = 2 diff --git a/src/dist/replication/test/replica_test/unit_test/config-test.ini b/src/dist/replication/test/replica_test/unit_test/config-test.ini index 294f3fe81d..2998e08a6b 100644 --- a/src/dist/replication/test/replica_test/unit_test/config-test.ini +++ b/src/dist/replication/test/replica_test/unit_test/config-test.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger ;io_mode = IOE_PER_NODE io_mode = IOE_PER_QUEUE @@ -35,9 +34,6 @@ stderr_start_level = LOG_LEVEL_WARNING [tools.simulator] random_seed = 1465902258 -[tools.screen_logger] -short_header = false - [network] ; how many network threads for network library (used by asio) io_service_worker_count = 2 diff --git a/src/dist/replication/test/simple_kv/case-000.ini b/src/dist/replication/test/simple_kv/case-000.ini index 5481291e6f..356dd99699 100644 --- a/src/dist/replication/test/simple_kv/case-000.ini +++ b/src/dist/replication/test/simple_kv/case-000.ini @@ -44,7 +44,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-001.ini b/src/dist/replication/test/simple_kv/case-001.ini index 9cee756efd..64155a8fbd 100644 --- a/src/dist/replication/test/simple_kv/case-001.ini +++ b/src/dist/replication/test/simple_kv/case-001.ini @@ -44,7 +44,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-002.ini b/src/dist/replication/test/simple_kv/case-002.ini index 50a0fbb98a..4e361ecf1c 100644 --- a/src/dist/replication/test/simple_kv/case-002.ini +++ b/src/dist/replication/test/simple_kv/case-002.ini @@ -44,7 +44,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-003.ini b/src/dist/replication/test/simple_kv/case-003.ini index 3087f1e308..c1f38fcd20 100644 --- a/src/dist/replication/test/simple_kv/case-003.ini +++ b/src/dist/replication/test/simple_kv/case-003.ini @@ -44,7 +44,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-004.ini b/src/dist/replication/test/simple_kv/case-004.ini index a5350ea821..723845534b 100644 --- a/src/dist/replication/test/simple_kv/case-004.ini +++ b/src/dist/replication/test/simple_kv/case-004.ini @@ -44,7 +44,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-005.ini b/src/dist/replication/test/simple_kv/case-005.ini index 717ce295e6..a816ee6aab 100644 --- a/src/dist/replication/test/simple_kv/case-005.ini +++ b/src/dist/replication/test/simple_kv/case-005.ini @@ -44,7 +44,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-006.ini b/src/dist/replication/test/simple_kv/case-006.ini index 2a899bba7d..d17792d9fc 100644 --- a/src/dist/replication/test/simple_kv/case-006.ini +++ b/src/dist/replication/test/simple_kv/case-006.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-100.ini b/src/dist/replication/test/simple_kv/case-100.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-100.ini +++ b/src/dist/replication/test/simple_kv/case-100.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-101.ini b/src/dist/replication/test/simple_kv/case-101.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-101.ini +++ b/src/dist/replication/test/simple_kv/case-101.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-102.ini b/src/dist/replication/test/simple_kv/case-102.ini index 86f7afefef..3cef6d7d26 100644 --- a/src/dist/replication/test/simple_kv/case-102.ini +++ b/src/dist/replication/test/simple_kv/case-102.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-103.ini b/src/dist/replication/test/simple_kv/case-103.ini index 2611f242d4..527f26e382 100644 --- a/src/dist/replication/test/simple_kv/case-103.ini +++ b/src/dist/replication/test/simple_kv/case-103.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-104.ini b/src/dist/replication/test/simple_kv/case-104.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-104.ini +++ b/src/dist/replication/test/simple_kv/case-104.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-105.ini b/src/dist/replication/test/simple_kv/case-105.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-105.ini +++ b/src/dist/replication/test/simple_kv/case-105.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-106.ini b/src/dist/replication/test/simple_kv/case-106.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-106.ini +++ b/src/dist/replication/test/simple_kv/case-106.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-107.ini b/src/dist/replication/test/simple_kv/case-107.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-107.ini +++ b/src/dist/replication/test/simple_kv/case-107.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-108.ini b/src/dist/replication/test/simple_kv/case-108.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-108.ini +++ b/src/dist/replication/test/simple_kv/case-108.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-109.ini b/src/dist/replication/test/simple_kv/case-109.ini index a10fd75865..a86545b4e9 100644 --- a/src/dist/replication/test/simple_kv/case-109.ini +++ b/src/dist/replication/test/simple_kv/case-109.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-200.ini b/src/dist/replication/test/simple_kv/case-200.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-200.ini +++ b/src/dist/replication/test/simple_kv/case-200.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-201.ini b/src/dist/replication/test/simple_kv/case-201.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-201.ini +++ b/src/dist/replication/test/simple_kv/case-201.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-202-0.ini b/src/dist/replication/test/simple_kv/case-202-0.ini index d735641380..7c902ba21c 100644 --- a/src/dist/replication/test/simple_kv/case-202-0.ini +++ b/src/dist/replication/test/simple_kv/case-202-0.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-202-1.ini b/src/dist/replication/test/simple_kv/case-202-1.ini index d735641380..7c902ba21c 100644 --- a/src/dist/replication/test/simple_kv/case-202-1.ini +++ b/src/dist/replication/test/simple_kv/case-202-1.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-203-0.ini b/src/dist/replication/test/simple_kv/case-203-0.ini index f0212865a0..3942f070d9 100644 --- a/src/dist/replication/test/simple_kv/case-203-0.ini +++ b/src/dist/replication/test/simple_kv/case-203-0.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-203-1.ini b/src/dist/replication/test/simple_kv/case-203-1.ini index f0212865a0..3942f070d9 100644 --- a/src/dist/replication/test/simple_kv/case-203-1.ini +++ b/src/dist/replication/test/simple_kv/case-203-1.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-204.ini b/src/dist/replication/test/simple_kv/case-204.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-204.ini +++ b/src/dist/replication/test/simple_kv/case-204.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-205.ini b/src/dist/replication/test/simple_kv/case-205.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-205.ini +++ b/src/dist/replication/test/simple_kv/case-205.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-206.ini b/src/dist/replication/test/simple_kv/case-206.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-206.ini +++ b/src/dist/replication/test/simple_kv/case-206.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-207.ini b/src/dist/replication/test/simple_kv/case-207.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-207.ini +++ b/src/dist/replication/test/simple_kv/case-207.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-208.ini b/src/dist/replication/test/simple_kv/case-208.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-208.ini +++ b/src/dist/replication/test/simple_kv/case-208.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-209.ini b/src/dist/replication/test/simple_kv/case-209.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-209.ini +++ b/src/dist/replication/test/simple_kv/case-209.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-210.ini b/src/dist/replication/test/simple_kv/case-210.ini index 0826d52eee..cce04fb809 100644 --- a/src/dist/replication/test/simple_kv/case-210.ini +++ b/src/dist/replication/test/simple_kv/case-210.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-211.ini b/src/dist/replication/test/simple_kv/case-211.ini index 0826d52eee..cce04fb809 100644 --- a/src/dist/replication/test/simple_kv/case-211.ini +++ b/src/dist/replication/test/simple_kv/case-211.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-212.ini b/src/dist/replication/test/simple_kv/case-212.ini index 0826d52eee..cce04fb809 100644 --- a/src/dist/replication/test/simple_kv/case-212.ini +++ b/src/dist/replication/test/simple_kv/case-212.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-213.ini b/src/dist/replication/test/simple_kv/case-213.ini index ff226bc1a7..372aac99e1 100644 --- a/src/dist/replication/test/simple_kv/case-213.ini +++ b/src/dist/replication/test/simple_kv/case-213.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-214.ini b/src/dist/replication/test/simple_kv/case-214.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-214.ini +++ b/src/dist/replication/test/simple_kv/case-214.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-215.ini b/src/dist/replication/test/simple_kv/case-215.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-215.ini +++ b/src/dist/replication/test/simple_kv/case-215.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-216.ini b/src/dist/replication/test/simple_kv/case-216.ini index 4addde14bf..dff7989bfb 100644 --- a/src/dist/replication/test/simple_kv/case-216.ini +++ b/src/dist/replication/test/simple_kv/case-216.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-300-0.ini b/src/dist/replication/test/simple_kv/case-300-0.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-300-0.ini +++ b/src/dist/replication/test/simple_kv/case-300-0.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-300-1.ini b/src/dist/replication/test/simple_kv/case-300-1.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-300-1.ini +++ b/src/dist/replication/test/simple_kv/case-300-1.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-300-2.ini b/src/dist/replication/test/simple_kv/case-300-2.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-300-2.ini +++ b/src/dist/replication/test/simple_kv/case-300-2.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-301.ini b/src/dist/replication/test/simple_kv/case-301.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-301.ini +++ b/src/dist/replication/test/simple_kv/case-301.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-302.ini b/src/dist/replication/test/simple_kv/case-302.ini index 931f843e25..6bef4903a0 100644 --- a/src/dist/replication/test/simple_kv/case-302.ini +++ b/src/dist/replication/test/simple_kv/case-302.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-303.ini b/src/dist/replication/test/simple_kv/case-303.ini index 2ac9cda863..d67df3a6d8 100644 --- a/src/dist/replication/test/simple_kv/case-303.ini +++ b/src/dist/replication/test/simple_kv/case-303.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-304.ini b/src/dist/replication/test/simple_kv/case-304.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-304.ini +++ b/src/dist/replication/test/simple_kv/case-304.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-305.ini b/src/dist/replication/test/simple_kv/case-305.ini index 2ac9cda863..d67df3a6d8 100644 --- a/src/dist/replication/test/simple_kv/case-305.ini +++ b/src/dist/replication/test/simple_kv/case-305.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-306.ini b/src/dist/replication/test/simple_kv/case-306.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-306.ini +++ b/src/dist/replication/test/simple_kv/case-306.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-307.ini b/src/dist/replication/test/simple_kv/case-307.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-307.ini +++ b/src/dist/replication/test/simple_kv/case-307.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-400.ini b/src/dist/replication/test/simple_kv/case-400.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-400.ini +++ b/src/dist/replication/test/simple_kv/case-400.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-401.ini b/src/dist/replication/test/simple_kv/case-401.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-401.ini +++ b/src/dist/replication/test/simple_kv/case-401.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-402.ini b/src/dist/replication/test/simple_kv/case-402.ini index 23b6193e7f..e725601cf2 100644 --- a/src/dist/replication/test/simple_kv/case-402.ini +++ b/src/dist/replication/test/simple_kv/case-402.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-600.ini b/src/dist/replication/test/simple_kv/case-600.ini index 2a899bba7d..d17792d9fc 100644 --- a/src/dist/replication/test/simple_kv/case-600.ini +++ b/src/dist/replication/test/simple_kv/case-600.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-601.ini b/src/dist/replication/test/simple_kv/case-601.ini index 230bcaafc8..b036d71e4f 100644 --- a/src/dist/replication/test/simple_kv/case-601.ini +++ b/src/dist/replication/test/simple_kv/case-601.ini @@ -45,7 +45,6 @@ toollets = tracer,test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-602.ini b/src/dist/replication/test/simple_kv/case-602.ini index 2a899bba7d..d17792d9fc 100644 --- a/src/dist/replication/test/simple_kv/case-602.ini +++ b/src/dist/replication/test/simple_kv/case-602.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/case-603.ini b/src/dist/replication/test/simple_kv/case-603.ini index 071ba5df44..234af4b93c 100644 --- a/src/dist/replication/test/simple_kv/case-603.ini +++ b/src/dist/replication/test/simple_kv/case-603.ini @@ -45,7 +45,6 @@ toollets = test_injector pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] diff --git a/src/dist/replication/test/simple_kv/config.ini b/src/dist/replication/test/simple_kv/config.ini index 9552e66d66..93461c8157 100644 --- a/src/dist/replication/test/simple_kv/config.ini +++ b/src/dist/replication/test/simple_kv/config.ini @@ -62,8 +62,6 @@ toollets = tracer, profiler, fault_injector pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING -;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simulator] diff --git a/src/tests/dsn/config-test.ini b/src/tests/dsn/config-test.ini index a30e73dfa2..a4c9e8bbeb 100644 --- a/src/tests/dsn/config-test.ini +++ b/src/tests/dsn/config-test.ini @@ -55,7 +55,6 @@ tool = nativerun pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger ;io_mode = IOE_PER_NODE io_mode = IOE_PER_QUEUE @@ -69,9 +68,6 @@ stderr_start_level = LOG_LEVEL_WARNING [tools.simulator] random_seed = 0 -[tools.screen_logger] -short_header = false - [network] ; how many network threads for network library (used by asio) io_service_worker_count = 2