summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2019-07-05 11:18:50 +0200
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2019-07-09 09:55:39 -0400
commiteee235bd2ada33a06499cdcb426706fa7cd9fc41 (patch)
treeed0d3f552b4746b8a23c380075bd2bc52afbd96d
parentd85ac8993cf7920eea9b7a9d4c1389474a507771 (diff)
downloadmongo-eee235bd2ada33a06499cdcb426706fa7cd9fc41.tar.gz
SERVER-30607 Do not log MongoS build info twice at startup
(cherry picked from commit 83292f18bc75726a548ab7c9c5c650d779c90684)
-rw-r--r--src/mongo/s/version_mongos.cpp6
-rw-r--r--src/mongo/s/version_mongos.h9
2 files changed, 10 insertions, 5 deletions
diff --git a/src/mongo/s/version_mongos.cpp b/src/mongo/s/version_mongos.cpp
index 499b1e8af90..4e80a8e36f3 100644
--- a/src/mongo/s/version_mongos.cpp
+++ b/src/mongo/s/version_mongos.cpp
@@ -42,15 +42,15 @@
namespace mongo {
-void printShardingVersionInfo(bool out) {
+void printShardingVersionInfo(bool isForVersionReportingOnly) {
auto&& vii = VersionInfoInterface::instance();
- if (out) {
+
+ if (isForVersionReportingOnly) {
setPlainConsoleLogger();
log() << mongosVersion(vii);
vii.logBuildInfo();
} else {
log() << mongosVersion(vii);
- vii.logBuildInfo();
logProcessDetails();
}
}
diff --git a/src/mongo/s/version_mongos.h b/src/mongo/s/version_mongos.h
index e4634e48d0d..c688b075abb 100644
--- a/src/mongo/s/version_mongos.h
+++ b/src/mongo/s/version_mongos.h
@@ -28,6 +28,11 @@
*/
namespace mongo {
-// print mongos version info
-void printShardingVersionInfo(bool out);
+
+/**
+ * Outputs the version of MongoS either to the standard output (as part of the --version option,
+ * which case isForVersionReportingOnly = true) or to the log file as part of server startup.
+ */
+void printShardingVersionInfo(bool isForVersionReportingOnly);
+
} // namespace mongo