From 134a4083953270e8a11430395357fb70a29047ad Mon Sep 17 00:00:00 2001 From: "clang-format-7.0.1" Date: Fri, 26 Jul 2019 18:20:35 -0400 Subject: SERVER-41772 Apply clang-format 7.0.1 to the codebase --- src/mongo/logger/encoder.h | 2 +- src/mongo/logger/log_component.cpp | 4 ++-- src/mongo/logger/log_component_settings.cpp | 4 ++-- src/mongo/logger/log_manager.cpp | 4 ++-- src/mongo/logger/log_severity.cpp | 6 ++++- src/mongo/logger/log_test.cpp | 3 +-- src/mongo/logger/parse_log_component_settings.cpp | 26 ++++++++++------------ .../logger/parse_log_component_settings_test.cpp | 7 ++---- src/mongo/logger/ramlog.cpp | 2 +- src/mongo/logger/ramlog.h | 2 +- src/mongo/logger/rotatable_file_writer.cpp | 18 +++++++-------- src/mongo/logger/rotatable_file_writer_test.cpp | 2 +- 12 files changed, 38 insertions(+), 42 deletions(-) (limited to 'src/mongo/logger') diff --git a/src/mongo/logger/encoder.h b/src/mongo/logger/encoder.h index f51642d62e7..29226dc2f5c 100644 --- a/src/mongo/logger/encoder.h +++ b/src/mongo/logger/encoder.h @@ -48,4 +48,4 @@ public: }; } // namespace logger -} // nnamspace mongo +} // namespace mongo diff --git a/src/mongo/logger/log_component.cpp b/src/mongo/logger/log_component.cpp index a214fd757e2..ec389788d43 100644 --- a/src/mongo/logger/log_component.cpp +++ b/src/mongo/logger/log_component.cpp @@ -245,5 +245,5 @@ std::ostream& operator<<(std::ostream& os, LogComponent component) { return os << component.getNameForLog(); } -} // logger -} // mongo +} // namespace logger +} // namespace mongo diff --git a/src/mongo/logger/log_component_settings.cpp b/src/mongo/logger/log_component_settings.cpp index c43e5d7d79b..f1da736be2c 100644 --- a/src/mongo/logger/log_component_settings.cpp +++ b/src/mongo/logger/log_component_settings.cpp @@ -117,5 +117,5 @@ bool LogComponentSettings::shouldLog(LogComponent component, LogSeverity severit return severity >= LogSeverity::cast(_minimumLoggedSeverity[component].loadRelaxed()); } -} // logger -} // mongo +} // namespace logger +} // namespace mongo diff --git a/src/mongo/logger/log_manager.cpp b/src/mongo/logger/log_manager.cpp index 6d349e29459..c167853353f 100644 --- a/src/mongo/logger/log_manager.cpp +++ b/src/mongo/logger/log_manager.cpp @@ -72,5 +72,5 @@ bool LogManager::isDefaultConsoleAppenderAttached() const { return static_cast(_defaultAppender); } -} // logger -} // mongo +} // namespace logger +} // namespace mongo diff --git a/src/mongo/logger/log_severity.cpp b/src/mongo/logger/log_severity.cpp index 90ba9967e88..349be573983 100644 --- a/src/mongo/logger/log_severity.cpp +++ b/src/mongo/logger/log_severity.cpp @@ -46,7 +46,11 @@ constexpr auto infoSeverityString = "info"_sd; constexpr auto debugSeverityString = "debug"_sd; constexpr StringData kDebugLevelStrings[LogSeverity::kMaxDebugLevel] = { - "D1"_sd, "D2"_sd, "D3"_sd, "D4"_sd, "D5"_sd, + "D1"_sd, + "D2"_sd, + "D3"_sd, + "D4"_sd, + "D5"_sd, }; } // namespace diff --git a/src/mongo/logger/log_test.cpp b/src/mongo/logger/log_test.cpp index 836e82bb8ea..9fb534a135f 100644 --- a/src/mongo/logger/log_test.cpp +++ b/src/mongo/logger/log_test.cpp @@ -382,8 +382,7 @@ void testEncodedLogLine(const MessageEventEphemeral& event, const std::string& e std::string s = os.str(); if (s.find(expectedSubstring) == std::string::npos) { FAIL(str::stream() << "encoded log line does not contain substring \"" << expectedSubstring - << "\". log line: " - << s); + << "\". log line: " << s); } } diff --git a/src/mongo/logger/parse_log_component_settings.cpp b/src/mongo/logger/parse_log_component_settings.cpp index 7a8ee40f7cc..1982587e130 100644 --- a/src/mongo/logger/parse_log_component_settings.cpp +++ b/src/mongo/logger/parse_log_component_settings.cpp @@ -81,10 +81,10 @@ StatusWith> parseLogComponentSettings(const BSO if (elem.fieldNameStringData() == "verbosity") { if (!elem.isNumber()) { return StatusWith(ErrorCodes::BadValue, - str::stream() << "Expected " - << parentComponent.getDottedName() - << ".verbosity to be a number, but found " - << typeName(elem.type())); + str::stream() + << "Expected " << parentComponent.getDottedName() + << ".verbosity to be a number, but found " + << typeName(elem.type())); } levelsToSet.push_back((LogComponentSetting(parentComponent, elem.numberInt()))); continue; @@ -93,22 +93,20 @@ StatusWith> parseLogComponentSettings(const BSO const LogComponent curr = _getComponentForShortName(shortName); if (curr == LogComponent::kNumLogComponents || curr.parent() != parentComponent) { - return StatusWith( - ErrorCodes::BadValue, - str::stream() << "Invalid component name " << parentComponent.getDottedName() << "." - << shortName); + return StatusWith(ErrorCodes::BadValue, + str::stream() + << "Invalid component name " + << parentComponent.getDottedName() << "." << shortName); } if (elem.isNumber()) { levelsToSet.push_back(LogComponentSetting(curr, elem.numberInt())); continue; } if (elem.type() != Object) { - return StatusWith(ErrorCodes::BadValue, - str::stream() << "Invalid type " << typeName(elem.type()) - << "for component " - << parentComponent.getDottedName() - << "." - << shortName); + return StatusWith( + ErrorCodes::BadValue, + str::stream() << "Invalid type " << typeName(elem.type()) << "for component " + << parentComponent.getDottedName() << "." << shortName); } iterators.push_back(iter); parentComponent = curr; diff --git a/src/mongo/logger/parse_log_component_settings_test.cpp b/src/mongo/logger/parse_log_component_settings_test.cpp index 5d91f7b0f78..2271a16dbdd 100644 --- a/src/mongo/logger/parse_log_component_settings_test.cpp +++ b/src/mongo/logger/parse_log_component_settings_test.cpp @@ -140,10 +140,7 @@ TEST(Multi, FailBadComponent) { BSONObj input = BSON("verbosity" << 6 << "accessControl" << BSON("verbosity" << 5) << "storage" << BSON("verbosity" << 4 << "journal" << BSON("verbosity" << 6)) - << "No Such Component" - << BSON("verbosity" << 2) - << "extrafield" - << 123); + << "No Such Component" << BSON("verbosity" << 2) << "extrafield" << 123); StatusWith result = parseLogComponentSettings(input); @@ -175,4 +172,4 @@ TEST(DeeplyNested, FailLast) { ASSERT_EQUALS(result.getStatus().reason(), "Invalid component name storage.journal.No Such Component"); } -} +} // namespace diff --git a/src/mongo/logger/ramlog.cpp b/src/mongo/logger/ramlog.cpp index a2bf4bffd15..67e1fe4b89b 100644 --- a/src/mongo/logger/ramlog.cpp +++ b/src/mongo/logger/ramlog.cpp @@ -221,4 +221,4 @@ MONGO_INITIALIZER(RamLogCatalog)(InitializerContext*) { return Status::OK(); } -} +} // namespace mongo diff --git a/src/mongo/logger/ramlog.h b/src/mongo/logger/ramlog.h index 15ad0d8526e..306dc36bff4 100644 --- a/src/mongo/logger/ramlog.h +++ b/src/mongo/logger/ramlog.h @@ -183,4 +183,4 @@ public: private: RamLog* _ramlog; }; -} +} // namespace mongo diff --git a/src/mongo/logger/rotatable_file_writer.cpp b/src/mongo/logger/rotatable_file_writer.cpp index a8bd27a0fc4..0c5ed612b99 100644 --- a/src/mongo/logger/rotatable_file_writer.cpp +++ b/src/mongo/logger/rotatable_file_writer.cpp @@ -70,7 +70,7 @@ std::wstring utf8ToWide(StringData utf8Str) { utf8Str.size(), // Count tempBuffer.get(), // UTF-16 output buffer utf8Str.size() // Buffer size in wide characters - ); + ); // TODO(schwerin): fassert finalSize > 0? return std::wstring(tempBuffer.get(), finalSize); } @@ -142,7 +142,7 @@ bool Win32FileStreambuf::open(StringData fileName, bool append) { OPEN_ALWAYS, // dwCreationDisposition FILE_ATTRIBUTE_NORMAL, // dwFlagsAndAttributes nullptr // hTemplateFile - ); + ); if (INVALID_HANDLE_VALUE == _fileHandle) @@ -212,9 +212,9 @@ Status RotatableFileWriter::Use::rotate(bool renameOnRotate, const std::string& try { if (boost::filesystem::exists(renameTarget)) { return Status(ErrorCodes::FileRenameFailed, - str::stream() << "Renaming file " << _writer->_fileName << " to " - << renameTarget - << " failed; destination already exists"); + str::stream() + << "Renaming file " << _writer->_fileName << " to " + << renameTarget << " failed; destination already exists"); } } catch (const std::exception& e) { return Status(ErrorCodes::FileRenameFailed, @@ -229,11 +229,9 @@ Status RotatableFileWriter::Use::rotate(bool renameOnRotate, const std::string& boost::filesystem::rename(_writer->_fileName, renameTarget, ec); if (ec) { return Status(ErrorCodes::FileRenameFailed, - str::stream() << "Failed to rename \"" << _writer->_fileName - << "\" to \"" - << renameTarget - << "\": " - << ec.message()); + str::stream() + << "Failed to rename \"" << _writer->_fileName << "\" to \"" + << renameTarget << "\": " << ec.message()); // TODO(schwerin): Make errnoWithDescription() available in the logger library, and // use it here. } diff --git a/src/mongo/logger/rotatable_file_writer_test.cpp b/src/mongo/logger/rotatable_file_writer_test.cpp index 2254e96f0be..ee97a5bede2 100644 --- a/src/mongo/logger/rotatable_file_writer_test.cpp +++ b/src/mongo/logger/rotatable_file_writer_test.cpp @@ -143,4 +143,4 @@ TEST_F(RotatableFileWriterTest, RotationTest) { } } -} // namespace mongo +} // namespace -- cgit v1.2.1