From: Kefu Chai <kchai@redhat.com>
Date: Sat, 24 Jul 2021 13:29:51 +0000 (+0800)
Subject: crimson/osd: print logging using logger() in main()
X-Git-Tag: v17.1.0~1285^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42475%2Fhead;p=ceph.git

crimson/osd: print logging using logger() in main()

more consistent and easier to parse this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 48519c600ea1..784d7a5dc59e 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 <ID>\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;
       });
     });