From c4e1b4d7efe5702bbfe1cea99ba79b5c67b3e01b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 24 Jul 2021 21:29:51 +0800 Subject: [PATCH] crimson/osd: print logging using logger() in main() more consistent and easier to parse this way. Signed-off-by: Kefu Chai --- src/crimson/osd/main.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 48519c600ea17..784d7a5dc59e6 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -31,6 +31,10 @@ namespace bpo = boost::program_options; using config_t = crimson::common::ConfigProxy; +seastar::logger& logger() { + return crimson::get_logger(ceph_subsys_osd); +} + void usage(const char* prog) { std::cout << "usage: " << prog << " -i \n" << " --help-seastar show Seastar help messages\n"; @@ -315,15 +319,15 @@ int main(int argc, char* argv[]) } else { osd.invoke_on(0, &crimson::osd::OSD::start).get(); } - seastar::fprint(std::cout, "crimson startup completed."); + logger().info("crimson startup completed"); should_stop.wait().get(); - seastar::fprint(std::cout, "crimson shutting down."); + logger().info("crimson shutting down"); // stop()s registered using defer() are called here } catch (...) { - seastar::fprint(std::cerr, "FATAL: startup failed: %s\n", std::current_exception()); + logger().error("startup failed: {}", std::current_exception()); return EXIT_FAILURE; } - seastar::fprint(std::cout, "crimson shutdown complete"); + logger().info("crimson shutdown complete"); return EXIT_SUCCESS; }); }); -- 2.39.5