From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Aug 2014 04:00:37 +0000 (-0700)
Subject: ceph-conf: flush log on exit
X-Git-Tag: v0.84~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2193%2Fhead;p=ceph.git

ceph-conf: flush log on exit

This makes it deterministic whether we output

2014-08-03 20:59:45.482614 4036c80 -1 did not load config file, using default settings.

or not, and will make the unit tests stop intermittently failing.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc
index dac734b03121..30e40ab9a91d 100644
--- a/src/tools/ceph_conf.cc
+++ b/src/tools/ceph_conf.cc
@@ -206,6 +206,7 @@ int main(int argc, const char **argv)
     }
   }
 
+  g_ceph_context->_log->flush();
   if (action == "help") {
     usage();
     exit(0);