Revert commit 0e9ccd73ef
				
					
				
			This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
				
			|||||||
/*
 | 
					/*
 | 
				
			||||||
 * This content is released under the MIT License as specified in https://raw.githubusercontent.com/gabime/spdlog/master/LICENSE
 | 
					* This content is released under the MIT License as specified in https://raw.githubusercontent.com/gabime/spdlog/master/LICENSE
 | 
				
			||||||
 */
 | 
					*/
 | 
				
			||||||
#include "includes.h"
 | 
					#include "includes.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
@@ -11,111 +11,111 @@
 | 
				
			|||||||
class failing_sink : public spdlog::sinks::base_sink<std::mutex>
 | 
					class failing_sink : public spdlog::sinks::base_sink<std::mutex>
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
protected:
 | 
					protected:
 | 
				
			||||||
    void sink_it_(const spdlog::details::log_msg &) final
 | 
					   void sink_it_(const spdlog::details::log_msg &) final
 | 
				
			||||||
    {
 | 
					   {
 | 
				
			||||||
        throw std::runtime_error("some error happened during log");
 | 
					       throw std::runtime_error("some error happened during log");
 | 
				
			||||||
    }
 | 
					   }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void flush_() final
 | 
					   void flush_() final
 | 
				
			||||||
    {
 | 
					   {
 | 
				
			||||||
        throw std::runtime_error("some error happened during flush");
 | 
					       throw std::runtime_error("some error happened during flush");
 | 
				
			||||||
    }
 | 
					   }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("default_error_handler", "[errors]]")
 | 
					TEST_CASE("default_error_handler", "[errors]]")
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    prepare_logdir();
 | 
					   prepare_logdir();
 | 
				
			||||||
    spdlog::filename_t filename = SPDLOG_FILENAME_T(SIMPLE_LOG);
 | 
					   spdlog::filename_t filename = SPDLOG_FILENAME_T(SIMPLE_LOG);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    auto logger = spdlog::create<spdlog::sinks::basic_file_sink_mt>("test-error", filename, true);
 | 
					   auto logger = spdlog::create<spdlog::sinks::basic_file_sink_mt>("test-error", filename, true);
 | 
				
			||||||
    logger->set_pattern("%v");
 | 
					   logger->set_pattern("%v");
 | 
				
			||||||
    logger->info("Test message {} {}", 1);
 | 
					   logger->info(SPDLOG_FMT_RUNTIME("Test message {} {}"), 1);
 | 
				
			||||||
    logger->info("Test message {}", 2);
 | 
					   logger->info("Test message {}", 2);
 | 
				
			||||||
    logger->flush();
 | 
					   logger->flush();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    using spdlog::details::os::default_eol;
 | 
					   using spdlog::details::os::default_eol;
 | 
				
			||||||
    REQUIRE(file_contents(SIMPLE_LOG) == spdlog::fmt_lib::format("Test message 2{}", default_eol));
 | 
					   REQUIRE(file_contents(SIMPLE_LOG) == spdlog::fmt_lib::format("Test message 2{}", default_eol));
 | 
				
			||||||
    REQUIRE(count_lines(SIMPLE_LOG) == 1);
 | 
					   REQUIRE(count_lines(SIMPLE_LOG) == 1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct custom_ex
 | 
					struct custom_ex
 | 
				
			||||||
{};
 | 
					{};
 | 
				
			||||||
TEST_CASE("custom_error_handler", "[errors]]")
 | 
					TEST_CASE("custom_error_handler", "[errors]]")
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    prepare_logdir();
 | 
					   prepare_logdir();
 | 
				
			||||||
    spdlog::filename_t filename = SPDLOG_FILENAME_T(SIMPLE_LOG);
 | 
					   spdlog::filename_t filename = SPDLOG_FILENAME_T(SIMPLE_LOG);
 | 
				
			||||||
    auto logger = spdlog::create<spdlog::sinks::basic_file_sink_mt>("logger", filename, true);
 | 
					   auto logger = spdlog::create<spdlog::sinks::basic_file_sink_mt>("logger", filename, true);
 | 
				
			||||||
    logger->flush_on(spdlog::level::info);
 | 
					   logger->flush_on(spdlog::level::info);
 | 
				
			||||||
    logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
					   logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
				
			||||||
    logger->info("Good message #1");
 | 
					   logger->info("Good message #1");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_THROWS_AS(logger->info("Bad format msg {} {}", "xxx"), custom_ex);
 | 
					   REQUIRE_THROWS_AS(logger->info(SPDLOG_FMT_RUNTIME("Bad format msg {} {}"), "xxx"), custom_ex);
 | 
				
			||||||
    logger->info("Good message #2");
 | 
					   logger->info("Good message #2");
 | 
				
			||||||
    require_message_count(SIMPLE_LOG, 2);
 | 
					   require_message_count(SIMPLE_LOG, 2);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("default_error_handler2", "[errors]]")
 | 
					TEST_CASE("default_error_handler2", "[errors]]")
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    spdlog::drop_all();
 | 
					   spdlog::drop_all();
 | 
				
			||||||
    auto logger = spdlog::create<failing_sink>("failed_logger");
 | 
					   auto logger = spdlog::create<failing_sink>("failed_logger");
 | 
				
			||||||
    logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
					   logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
				
			||||||
    REQUIRE_THROWS_AS(logger->info("Some message"), custom_ex);
 | 
					   REQUIRE_THROWS_AS(logger->info("Some message"), custom_ex);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("flush_error_handler", "[errors]]")
 | 
					TEST_CASE("flush_error_handler", "[errors]]")
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    spdlog::drop_all();
 | 
					   spdlog::drop_all();
 | 
				
			||||||
    auto logger = spdlog::create<failing_sink>("failed_logger");
 | 
					   auto logger = spdlog::create<failing_sink>("failed_logger");
 | 
				
			||||||
    logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
					   logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
				
			||||||
    REQUIRE_THROWS_AS(logger->flush(), custom_ex);
 | 
					   REQUIRE_THROWS_AS(logger->flush(), custom_ex);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("async_error_handler", "[errors]]")
 | 
					TEST_CASE("async_error_handler", "[errors]]")
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    prepare_logdir();
 | 
					   prepare_logdir();
 | 
				
			||||||
    std::string err_msg("log failed with some msg");
 | 
					   std::string err_msg("log failed with some msg");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    spdlog::filename_t filename = SPDLOG_FILENAME_T(SIMPLE_ASYNC_LOG);
 | 
					   spdlog::filename_t filename = SPDLOG_FILENAME_T(SIMPLE_ASYNC_LOG);
 | 
				
			||||||
    {
 | 
					   {
 | 
				
			||||||
        spdlog::init_thread_pool(128, 1);
 | 
					       spdlog::init_thread_pool(128, 1);
 | 
				
			||||||
        auto logger = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("logger", filename, true);
 | 
					       auto logger = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("logger", filename, true);
 | 
				
			||||||
        logger->set_error_handler([=](const std::string &) {
 | 
					       logger->set_error_handler([=](const std::string &) {
 | 
				
			||||||
            std::ofstream ofs("test_logs/custom_err.txt");
 | 
					           std::ofstream ofs("test_logs/custom_err.txt");
 | 
				
			||||||
            if (!ofs)
 | 
					           if (!ofs)
 | 
				
			||||||
            {
 | 
					           {
 | 
				
			||||||
                throw std::runtime_error("Failed open test_logs/custom_err.txt");
 | 
					               throw std::runtime_error("Failed open test_logs/custom_err.txt");
 | 
				
			||||||
            }
 | 
					           }
 | 
				
			||||||
            ofs << err_msg;
 | 
					           ofs << err_msg;
 | 
				
			||||||
        });
 | 
					       });
 | 
				
			||||||
        logger->info("Good message #1");
 | 
					       logger->info("Good message #1");
 | 
				
			||||||
        logger->info("Bad format msg {} {}", "xxx");
 | 
					       logger->info(SPDLOG_FMT_RUNTIME("Bad format msg {} {}"), "xxx");
 | 
				
			||||||
        logger->info("Good message #2");
 | 
					       logger->info("Good message #2");
 | 
				
			||||||
        spdlog::drop("logger"); // force logger to drain the queue and shutdown
 | 
					       spdlog::drop("logger"); // force logger to drain the queue and shutdown
 | 
				
			||||||
    }
 | 
					   }
 | 
				
			||||||
    spdlog::init_thread_pool(128, 1);
 | 
					   spdlog::init_thread_pool(128, 1);
 | 
				
			||||||
    require_message_count(SIMPLE_ASYNC_LOG, 2);
 | 
					   require_message_count(SIMPLE_ASYNC_LOG, 2);
 | 
				
			||||||
    REQUIRE(file_contents("test_logs/custom_err.txt") == err_msg);
 | 
					   REQUIRE(file_contents("test_logs/custom_err.txt") == err_msg);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Make sure async error handler is executed
 | 
					// Make sure async error handler is executed
 | 
				
			||||||
TEST_CASE("async_error_handler2", "[errors]]")
 | 
					TEST_CASE("async_error_handler2", "[errors]]")
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    prepare_logdir();
 | 
					   prepare_logdir();
 | 
				
			||||||
    std::string err_msg("This is async handler error message");
 | 
					   std::string err_msg("This is async handler error message");
 | 
				
			||||||
    {
 | 
					   {
 | 
				
			||||||
        spdlog::details::os::create_dir(SPDLOG_FILENAME_T("test_logs"));
 | 
					       spdlog::details::os::create_dir(SPDLOG_FILENAME_T("test_logs"));
 | 
				
			||||||
        spdlog::init_thread_pool(128, 1);
 | 
					       spdlog::init_thread_pool(128, 1);
 | 
				
			||||||
        auto logger = spdlog::create_async<failing_sink>("failed_logger");
 | 
					       auto logger = spdlog::create_async<failing_sink>("failed_logger");
 | 
				
			||||||
        logger->set_error_handler([=](const std::string &) {
 | 
					       logger->set_error_handler([=](const std::string &) {
 | 
				
			||||||
            std::ofstream ofs("test_logs/custom_err2.txt");
 | 
					           std::ofstream ofs("test_logs/custom_err2.txt");
 | 
				
			||||||
            if (!ofs)
 | 
					           if (!ofs)
 | 
				
			||||||
                throw std::runtime_error("Failed open test_logs/custom_err2.txt");
 | 
					               throw std::runtime_error("Failed open test_logs/custom_err2.txt");
 | 
				
			||||||
            ofs << err_msg;
 | 
					           ofs << err_msg;
 | 
				
			||||||
        });
 | 
					       });
 | 
				
			||||||
        logger->info("Hello failure");
 | 
					       logger->info("Hello failure");
 | 
				
			||||||
        spdlog::drop("failed_logger"); // force logger to drain the queue and shutdown
 | 
					       spdlog::drop("failed_logger"); // force logger to drain the queue and shutdown
 | 
				
			||||||
    }
 | 
					   }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    spdlog::init_thread_pool(128, 1);
 | 
					   spdlog::init_thread_pool(128, 1);
 | 
				
			||||||
    REQUIRE(file_contents("test_logs/custom_err2.txt") == err_msg);
 | 
					   REQUIRE(file_contents("test_logs/custom_err2.txt") == err_msg);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user