diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2019-04-08 16:27:50 -0400 |
|---|---|---|
| committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-04-09 15:38:40 -0400 |
| commit | 1041dd848e25e879260d1015d8da4f72ee7993fe (patch) | |
| tree | f8ddb4ee7c841e4ef790ea7bd53e75c0a09c4cc2 /src/mongo/db/initialize_server_global_state.cpp | |
| parent | 8cdc51e7810f7fd8898a4c60b935e389f04659ee (diff) | |
| download | mongo-1041dd848e25e879260d1015d8da4f72ee7993fe.tar.gz | |
SERVER-40476 remove mongoutils::str
Rename utils/mongoutils/str.h => utils/str.h
Rename namespace mongoutils::str => str
Rename mongo::strcasecmp => str::caseInsensitiveCompare.
Diffstat (limited to 'src/mongo/db/initialize_server_global_state.cpp')
| -rw-r--r-- | src/mongo/db/initialize_server_global_state.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp index 1cfcc8af7b3..0565045ba9f 100644 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -59,10 +59,10 @@ #include "mongo/logger/syslog_appender.h" #include "mongo/platform/process_id.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" #include "mongo/util/processinfo.h" #include "mongo/util/quick_exit.h" #include "mongo/util/signal_handlers_synchronous.h" +#include "mongo/util/str.h" #if defined(__APPLE__) #include <TargetConditionals.h> @@ -254,17 +254,15 @@ MONGO_INITIALIZER_GENERAL( exists = boost::filesystem::exists(absoluteLogpath); } catch (boost::filesystem::filesystem_error& e) { return Status(ErrorCodes::FileNotOpen, - mongoutils::str::stream() << "Failed probe for \"" << absoluteLogpath - << "\": " - << e.code().message()); + str::stream() << "Failed probe for \"" << absoluteLogpath << "\": " + << e.code().message()); } if (exists) { if (boost::filesystem::is_directory(absoluteLogpath)) { - return Status( - ErrorCodes::FileNotOpen, - mongoutils::str::stream() << "logpath \"" << absoluteLogpath - << "\" should name a file, not a directory."); + return Status(ErrorCodes::FileNotOpen, + str::stream() << "logpath \"" << absoluteLogpath + << "\" should name a file, not a directory."); } if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) { @@ -276,7 +274,7 @@ MONGO_INITIALIZER_GENERAL( << renameTarget << "\"."; } else { return Status(ErrorCodes::FileRenameFailed, - mongoutils::str::stream() + str::stream() << "Could not rename preexisting log file \"" << absoluteLogpath << "\" to \"" |