diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2021-02-16 01:15:53 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-03-18 04:03:22 +0000 |
commit | fad9de4ece9f5399acc804f206e40621930be5af (patch) | |
tree | 0a1dd3202e0d8ad0cc93a58c03d3519fba2abd23 /src/mongo/scripting | |
parent | 61df6d3c9a0a6658613d2ef9bcfb28bd14224acf (diff) | |
download | mongo-fad9de4ece9f5399acc804f206e40621930be5af.tar.gz |
SERVER-54596 remove 1-arg shouldLog function (an ODR violation)
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r-- | src/mongo/scripting/mozjs/engine.cpp | 4 | ||||
-rw-r--r-- | src/mongo/scripting/mozjs/implscope.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/scripting/mozjs/engine.cpp b/src/mongo/scripting/mozjs/engine.cpp index faad11b70ae..b4069e76ca2 100644 --- a/src/mongo/scripting/mozjs/engine.cpp +++ b/src/mongo/scripting/mozjs/engine.cpp @@ -93,7 +93,7 @@ void MozJSScriptEngine::interrupt(unsigned opId) { OpIdToScopeMap::iterator iScope = _opToScopeMap.find(opId); if (iScope == _opToScopeMap.end()) { // got interrupt request for a scope that no longer exists - if (shouldLog(logv2::LogSeverity::Debug(3))) { + if (shouldLog(MONGO_LOGV2_DEFAULT_COMPONENT, logv2::LogSeverity::Debug(3))) { // This log record gets extra attributes when the log severity is at Debug(3) // but we still log the record at log severity Debug(2). Simplify this if SERVER-48671 // gets done @@ -107,7 +107,7 @@ void MozJSScriptEngine::interrupt(unsigned opId) { } return; } - if (shouldLog(logv2::LogSeverity::Debug(3))) { + if (shouldLog(MONGO_LOGV2_DEFAULT_COMPONENT, logv2::LogSeverity::Debug(3))) { // Like above, this log record gets extra attributes when the log severity is at Debug(3) LOGV2_DEBUG(22809, 2, "Interrupting op", "opId"_attr = opId, "knownOps"_attr = knownOps()); } else { diff --git a/src/mongo/scripting/mozjs/implscope.cpp b/src/mongo/scripting/mozjs/implscope.cpp index 3834fff7629..097ecd1304a 100644 --- a/src/mongo/scripting/mozjs/implscope.cpp +++ b/src/mongo/scripting/mozjs/implscope.cpp @@ -233,7 +233,7 @@ bool MozJSImplScope::_interruptCallback(JSContext* cx) { } void MozJSImplScope::_gcCallback(JSContext* rt, JSGCStatus status, void* data) { - if (!shouldLog(logv2::LogSeverity::Debug(1))) { + if (!shouldLog(MONGO_LOGV2_DEFAULT_COMPONENT, logv2::LogSeverity::Debug(1))) { // don't collect stats unless verbose return; } |