diff --git a/include/dwarfs/logger.h b/include/dwarfs/logger.h index 26d85a4e..67cc7dc2 100644 --- a/include/dwarfs/logger.h +++ b/include/dwarfs/logger.h @@ -86,10 +86,6 @@ class stream_logger : public logger { stream_logger(std::shared_ptr term, std::ostream& os, level_type threshold = WARN, bool with_context = false); - [[deprecated]] stream_logger(std::ostream& os = std::cerr, - level_type threshold = WARN, - bool with_context = false); - void write(level_type level, const std::string& output, char const* file, int line) override; diff --git a/src/dwarfs/logger.cpp b/src/dwarfs/logger.cpp index 5d925611..400e4034 100644 --- a/src/dwarfs/logger.cpp +++ b/src/dwarfs/logger.cpp @@ -80,10 +80,6 @@ stream_logger::stream_logger(std::shared_ptr term, set_threshold(threshold); } -stream_logger::stream_logger(std::ostream& os, level_type threshold, - bool with_context) - : stream_logger{terminal::create(), os, threshold, with_context} {} - void stream_logger::preamble() {} void stream_logger::postamble() {} std::string_view stream_logger::get_newline() const { return "\n"; } diff --git a/test/dwarfs_benchmark.cpp b/test/dwarfs_benchmark.cpp index 15a8bf97..b04191fc 100644 --- a/test/dwarfs_benchmark.cpp +++ b/test/dwarfs_benchmark.cpp @@ -41,6 +41,7 @@ #include "dwarfs/worker_group.h" #include "mmap_mock.h" #include "test_helpers.h" +#include "test_logger.h" #include "test_strings.h" #include "dwarfs/gen-cpp2/metadata_layouts.h" @@ -117,9 +118,7 @@ std::string make_filesystem(::benchmark::State const& state) { worker_group wg("writer", 4); progress prog([](const progress&, bool) {}, 1000); - std::ostringstream logss; - stream_logger lgr(logss); // TODO: mock - lgr.set_policy(); + test::test_logger lgr; auto sf = std::make_shared(lgr, prog, cfg); @@ -170,7 +169,7 @@ void frozen_string_table_lookup(::benchmark::State& state) { auto data = make_frozen_string_table( test::test_strings, string_table::pack_options(state.range(0), state.range(1), true)); - stream_logger lgr; + test::test_logger lgr; string_table table(lgr, "bench", data); int i = 0; std::string str; @@ -182,7 +181,7 @@ void frozen_string_table_lookup(::benchmark::State& state) { void dwarfs_initialize(::benchmark::State& state) { auto image = make_filesystem(state); - stream_logger lgr; + test::test_logger lgr; auto mm = std::make_shared(image); filesystem_options opts; opts.block_cache.max_bytes = 1 << 20; @@ -283,7 +282,7 @@ class filesystem : public ::benchmark::Fixture { std::vector entries; private: - stream_logger lgr; + test::test_logger lgr; std::string image; std::shared_ptr mm; }; diff --git a/test/fuzz_categorizers.cpp b/test/fuzz_categorizers.cpp index 97349326..e3f288ec 100644 --- a/test/fuzz_categorizers.cpp +++ b/test/fuzz_categorizers.cpp @@ -34,7 +34,7 @@ int main(int argc, char** argv) { return 1; } - stream_logger lgr(std::cerr); + null_logger lgr; auto& catreg = categorizer_registry::instance(); auto catmgr = std::make_shared(lgr);