dout: don't print version when forcing fg logging.

dout: don't print version when forcing fg logging.

Fix tests that were assuming us to spew errors about /var/log, which we
no longer do.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/debug.cc b/src/common/debug.cc
index 84471872a0cb4f8b899f91a3e4aa96fcbe349bc1..0f433a7ea399fd5a94f3968b14a25c645161aa25 100644 (file)
--- a/src/common/debug.cc
+++ b/src/common/debug.cc
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <fstream>
 #include <iostream>
+#include <sstream>
 
 // debug output
 std::ostream *_dout = NULL;
@@ -21,7 +22,20 @@ pthread_mutex_t _dout_lock = PTHREAD_MUTEX_INITIALIZER;
 #define _STR(x) #x
 #define STRINGIFY(x) _STR(x)
 
-void _dout_open_log(bool print_version)
+std::string ceph_version_to_string(void)
+{
+  std::ostringstream oss;
+  oss << "ceph version " << VERSION << " (commit:"
+      << STRINGIFY(CEPH_GIT_VER) << ")";
+  return oss.str();
+}
+
+void dout_output_ceph_version(void)
+{
+  generic_dout(-1) << ceph_version_to_string() << dendl;
+}
+
+void _dout_open_log()
 {
   // should hold _dout_lock here
 
@@ -33,11 +47,6 @@ void _dout_open_log(bool print_version)
     _dout = new std::ostream(_doss);
   }
 
-  if (print_version) {
-    _doss->sputc(11);
-    *_dout << "ceph version " << VERSION << " (commit:"
-          << STRINGIFY(CEPH_GIT_VER) << ")" << std::endl;
-  }
   _dout_need_open = false;
 }
 
@@ -46,7 +55,7 @@ int dout_handle_daemonize()
   DoutLocker _dout_locker;
 
   if (_dout_need_open)
-       _dout_open_log(true);
+       _dout_open_log();
 
   assert(_doss);
   _doss->handle_stderr_closed();
@@ -58,7 +67,7 @@ int dout_create_rank_symlink(int n)
   DoutLocker _dout_locker;
 
   if (_dout_need_open)
-    _dout_open_log(true);
+    _dout_open_log();
 
   assert(_doss);
   return _doss->create_rank_symlink(n);

diff --git a/src/common/debug.h b/src/common/debug.h
index ecca170b1e5b87860ce0e2bfd7a543a1fb862d39..d0a981326ef81477361cc47ace26e750b79b8875 100644 (file)
--- a/src/common/debug.h
+++ b/src/common/debug.h
@@ -22,13 +22,18 @@
 #include "include/assert.h"
 
 #include <iosfwd>
+#include <string>
 
 extern std::ostream *_dout;
 extern DoutStreambuf <char> *_doss;
 extern bool _dout_need_open;
 extern pthread_mutex_t _dout_lock;
 
-extern void _dout_open_log(bool print_version);
+extern std::string ceph_version_to_string(void);
+
+extern void dout_output_ceph_version(void);
+
+extern void _dout_open_log();
 
 extern int dout_handle_daemonize();
 
@@ -47,7 +52,7 @@ public:
 
 static inline void _dout_begin_line(signed int prio) {
   if (unlikely(_dout_need_open))
-    _dout_open_log(true);
+    _dout_open_log();
 
   // Put priority information into dout
   _doss->sputc(prio + 12);

diff --git a/src/config.cc b/src/config.cc
index b96be8ec94de845962476bafec9fdfb55098d147..ca802911b11fc6a088bcea1e1eb3756257e9eef9 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -1100,7 +1100,11 @@ void parse_startup_config_options(std::vector<const char*>& args,
     // before initializing dout(). For now, just force a reopen here with the
     // configuration we have just read.
     DoutLocker _dout_locker;
-    _dout_open_log(false);
+    _dout_open_log();
+  }
+
+  if (!force_fg_logging) {
+    dout_output_ceph_version();
   }
 
   if (!cf)

diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t
index 5537234e948180d81f8f0df80e27b12ef635f4b6..9bc74880514e7e08817685b5e7f149b0356ada4d 100644 (file)
--- a/src/test/cli/monmaptool/add-exists.t
+++ b/src/test/cli/monmaptool/add-exists.t
@@ -1,6 +1,5 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (0 monitors)

diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t
index 52a0137970d7e6f9740796394a6dbbf07038ae65..b272a10d81c9c89d7a72559e800a38cc4c209595 100644 (file)
--- a/src/test/cli/monmaptool/add-many.t
+++ b/src/test/cli/monmaptool/add-many.t
@@ -1,6 +1,5 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (0 monitors)

diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t
index 34dd9952c3f4db740e4ede97c116f20db48d0e66..9e93d7f2dc3971ec1fa19474d992e68653ca2cd0 100644 (file)
--- a/src/test/cli/monmaptool/clobber.t
+++ b/src/test/cli/monmaptool/clobber.t
@@ -1,6 +1,5 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)

diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t
index 186f08ee6182e2c6db669ef09f008bfb20e043b9..70d77a79333dd581e794627073e93d3a987122f1 100644 (file)
--- a/src/test/cli/monmaptool/create-print.t
+++ b/src/test/cli/monmaptool/create-print.t
@@ -1,6 +1,5 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (0 monitors)

diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t
index f710f9d4d3e3860b7b1780736df391c50c356354..0ef0d59c3590132dfa9392918870cfa96c573c8f 100644 (file)
--- a/src/test/cli/monmaptool/create-with-add.t
+++ b/src/test/cli/monmaptool/create-with-add.t
@@ -1,6 +1,5 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)

diff --git a/src/test/cli/monmaptool/help.t b/src/test/cli/monmaptool/help.t
index 739ccf7339d20d90bb4ebb29728b820095867cc0..2244c0052b9b85e59ec6cbbb3a3ca699b8625829 100644 (file)
--- a/src/test/cli/monmaptool/help.t
+++ b/src/test/cli/monmaptool/help.t
@@ -1,7 +1,6 @@
 # TODO be user-friendly
   $ monmaptool --help
   monmaptool: monmap file --help
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open --help: error 2: No such file or directory (re)
   monmaptool: couldn't open --help: Is a directory
   [255]

diff --git a/src/test/cli/monmaptool/print-nonexistent.t b/src/test/cli/monmaptool/print-nonexistent.t
index afc53e1e7970001c5d83cd22570192415c5858c0..74f0f5d2219f89efd001a7661154a166d70e4d81 100644 (file)
--- a/src/test/cli/monmaptool/print-nonexistent.t
+++ b/src/test/cli/monmaptool/print-nonexistent.t
@@ -1,6 +1,5 @@
   $ monmaptool --print nonexistent
   monmaptool: monmap file nonexistent
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open nonexistent: error 2: No such file or directory (re)
   monmaptool: couldn't open nonexistent: Is a directory
   [255]

diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t
index ce86164f491b1d0eb1a831a829d380f6b97f93a8..df572881a4900e90d22c126bc6ef54c31a1aefec 100644 (file)
--- a/src/test/cli/monmaptool/rm-nonexistent.t
+++ b/src/test/cli/monmaptool/rm-nonexistent.t
@@ -1,6 +1,5 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)

diff --git a/src/test/cli/monmaptool/rm.t b/src/test/cli/monmaptool/rm.t
index b12a89127bcfe324fe7e08c16d33f47c152d99d8..8e8732a8e505b0d33cbda2989f8d16aabf7db637 100644 (file)
--- a/src/test/cli/monmaptool/rm.t
+++ b/src/test/cli/monmaptool/rm.t
@@ -1,6 +1,5 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
-  failed to open log file '/var/log/ceph/': error 21: Is a directory
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)