diff options
author | Mathias Stearn <mathias@10gen.com> | 2017-03-07 16:03:30 -0500 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2017-03-24 16:13:26 -0400 |
commit | 77f7e96fdccfdfb1313a1a2ac57ebab8ed0e8882 (patch) | |
tree | fc92545209a2d70826fdc949f8aeb4003944529a /src/mongo/logger | |
parent | fd46b39bd957df28fa2273bf5e4dcbb1765e4026 (diff) | |
download | mongo-77f7e96fdccfdfb1313a1a2ac57ebab8ed0e8882.tar.gz |
SERVER-27727 Make threadName a native thread_local so debuggers can get to it
Diffstat (limited to 'src/mongo/logger')
-rw-r--r-- | src/mongo/logger/logstream_builder.cpp | 13 | ||||
-rw-r--r-- | src/mongo/logger/logstream_builder.h | 8 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/mongo/logger/logstream_builder.cpp b/src/mongo/logger/logstream_builder.cpp index 69d3e151a47..af055be3120 100644 --- a/src/mongo/logger/logstream_builder.cpp +++ b/src/mongo/logger/logstream_builder.cpp @@ -73,25 +73,24 @@ struct ThreadOstreamCacheFinalizer { namespace logger { LogstreamBuilder::LogstreamBuilder(MessageLogDomain* domain, - std::string contextName, + StringData contextName, LogSeverity severity) - : LogstreamBuilder( - domain, std::move(contextName), std::move(severity), LogComponent::kDefault) {} + : LogstreamBuilder(domain, contextName, std::move(severity), LogComponent::kDefault) {} LogstreamBuilder::LogstreamBuilder(MessageLogDomain* domain, - std::string contextName, + StringData contextName, LogSeverity severity, LogComponent component) : _domain(domain), - _contextName(std::move(contextName)), + _contextName(contextName.toString()), _severity(std::move(severity)), _component(std::move(component)), _tee(nullptr) {} LogstreamBuilder::LogstreamBuilder(logger::MessageLogDomain* domain, - const std::string& contextName, + StringData contextName, LabeledLevel labeledLevel) - : LogstreamBuilder(domain, std::move(contextName), static_cast<LogSeverity>(labeledLevel)) { + : LogstreamBuilder(domain, contextName, static_cast<LogSeverity>(labeledLevel)) { setBaseMessage(labeledLevel.getLabel()); } diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h index 001175e6e1c..1dac8462564 100644 --- a/src/mongo/logger/logstream_builder.h +++ b/src/mongo/logger/logstream_builder.h @@ -65,7 +65,7 @@ public: * "contextName" is a short name of the thread or other context. * "severity" is the logging severity of the message. */ - LogstreamBuilder(MessageLogDomain* domain, std::string contextName, LogSeverity severity); + LogstreamBuilder(MessageLogDomain* domain, StringData contextName, LogSeverity severity); /** * Construct a LogstreamBuilder that writes to "domain" on destruction. @@ -75,16 +75,14 @@ public: * "component" is the primary log component of the message. */ LogstreamBuilder(MessageLogDomain* domain, - std::string contextName, + StringData contextName, LogSeverity severity, LogComponent component); /** * Deprecated. */ - LogstreamBuilder(MessageLogDomain* domain, - const std::string& contextName, - LabeledLevel labeledLevel); + LogstreamBuilder(MessageLogDomain* domain, StringData contextName, LabeledLevel labeledLevel); LogstreamBuilder(LogstreamBuilder&& other) = default; LogstreamBuilder& operator=(LogstreamBuilder&& other) = default; |