diff options
| author | Gabriel Marks <gabriel.marks@mongodb.com> | 2022-08-30 19:28:35 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-30 21:12:24 +0000 |
| commit | 36b8246daa269b1a21d63d3f0e11c31b274e6703 (patch) | |
| tree | 121fc5483e0bdd2effb73d6ac5e913761bb43ba6 /src/mongo/db/initialize_server_global_state.cpp | |
| parent | 27f7896edc0828d0c4bae3d70bbec7e8b0a66d98 (diff) | |
| download | mongo-36b8246daa269b1a21d63d3f0e11c31b274e6703.tar.gz | |
SERVER-68342 Modify ServerParameter to take tenantId
Diffstat (limited to 'src/mongo/db/initialize_server_global_state.cpp')
| -rw-r--r-- | src/mongo/db/initialize_server_global_state.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp index 240c2830fcb..02a30aac334 100644 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -468,7 +468,8 @@ MONGO_INITIALIZER_GENERAL(MungeUmask, ("EndStartupOptionHandling"), ("ServerLogR #endif // --setParameter honorSystemUmask -Status HonorSystemUMaskServerParameter::setFromString(const std::string& value) { +Status HonorSystemUMaskServerParameter::setFromString(StringData value, + const boost::optional<TenantId>&) { #ifndef _WIN32 if ((value == "0") || (value == "false")) { // false may be specified with processUmask @@ -494,15 +495,17 @@ Status HonorSystemUMaskServerParameter::setFromString(const std::string& value) } void HonorSystemUMaskServerParameter::append(OperationContext*, - BSONObjBuilder& b, - const std::string& name) { + BSONObjBuilder* b, + StringData name, + const boost::optional<TenantId>&) { #ifndef _WIN32 - b << name << honorSystemUmask; + *b << name << honorSystemUmask; #endif } // --setParameter processUmask -Status ProcessUMaskServerParameter::setFromString(const std::string& value) { +Status ProcessUMaskServerParameter::setFromString(StringData value, + const boost::optional<TenantId>&) { #ifndef _WIN32 if (honorSystemUmask) { return {ErrorCodes::BadValue, @@ -510,7 +513,8 @@ Status ProcessUMaskServerParameter::setFromString(const std::string& value) { } // Convert base from octal - const char* val = value.c_str(); + auto vstr = value.toString(); + const char* val = vstr.c_str(); char* end = nullptr; auto mask = std::strtoul(val, &end, 8); @@ -532,10 +536,11 @@ Status ProcessUMaskServerParameter::setFromString(const std::string& value) { } void ProcessUMaskServerParameter::append(OperationContext*, - BSONObjBuilder& b, - const std::string& name) { + BSONObjBuilder* b, + StringData name, + const boost::optional<TenantId>&) { #ifndef _WIN32 - b << name << static_cast<int>(getUmaskOverride()); + *b << name << static_cast<int>(getUmaskOverride()); #endif } |