summaryrefslogtreecommitdiff
path: root/src/mongo/scripting
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2020-05-18 15:50:24 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-06-02 16:49:35 +0000
commit4184f70adbfac60d6d045d9a0df46c11c3033768 (patch)
tree707ff5af8fa021dae7d958106572dacd5a13abf4 /src/mongo/scripting
parent0237c8441b0ba1dfef31c22cad82d4b4570aac16 (diff)
downloadmongo-4184f70adbfac60d6d045d9a0df46c11c3033768.tar.gz
SERVER-46189 Fix shell kill current ops with TLS replica set and down nodes
(cherry picked from commit 2fbd718e0ab222d4b6614c452b0241e325421395)
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r--src/mongo/scripting/engine.cpp2
-rw-r--r--src/mongo/scripting/engine.h8
-rw-r--r--src/mongo/scripting/mozjs/mongo.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
index 2e5a0e2abd0..12f7fcdaa8b 100644
--- a/src/mongo/scripting/engine.cpp
+++ b/src/mongo/scripting/engine.cpp
@@ -562,7 +562,7 @@ unique_ptr<Scope> ScriptEngine::getPooledScope(OperationContext* opCtx,
return p;
}
-void (*ScriptEngine::_connectCallback)(DBClientBase&) = 0;
+void (*ScriptEngine::_connectCallback)(DBClientBase&, StringData) = 0;
ScriptEngine* getGlobalScriptEngine() {
if (hasGlobalServiceContext())
diff --git a/src/mongo/scripting/engine.h b/src/mongo/scripting/engine.h
index 18eb7554e6e..8373f407cbf 100644
--- a/src/mongo/scripting/engine.h
+++ b/src/mongo/scripting/engine.h
@@ -249,12 +249,12 @@ public:
void setScopeInitCallback(void (*func)(Scope&)) {
_scopeInitCallback = func;
}
- static void setConnectCallback(void (*func)(DBClientBase&)) {
+ static void setConnectCallback(void (*func)(DBClientBase&, StringData)) {
_connectCallback = func;
}
- static void runConnectCallback(DBClientBase& c) {
+ static void runConnectCallback(DBClientBase& c, StringData uri) {
if (_connectCallback)
- _connectCallback(c);
+ _connectCallback(c, uri);
}
// engine implementation may either respond to interrupt events or
@@ -270,7 +270,7 @@ protected:
void (*_scopeInitCallback)(Scope&);
private:
- static void (*_connectCallback)(DBClientBase&);
+ static void (*_connectCallback)(DBClientBase&, StringData);
};
void installGlobalUtils(Scope& scope);
diff --git a/src/mongo/scripting/mozjs/mongo.cpp b/src/mongo/scripting/mozjs/mongo.cpp
index 943d0b04716..5d856af72ae 100644
--- a/src/mongo/scripting/mozjs/mongo.cpp
+++ b/src/mongo/scripting/mozjs/mongo.cpp
@@ -832,7 +832,7 @@ void MongoExternalInfo::construct(JSContext* cx, JS::CallArgs args) {
uasserted(ErrorCodes::InternalError, errmsg);
}
- ScriptEngine::runConnectCallback(*conn);
+ ScriptEngine::runConnectCallback(*conn, host);
JS::RootedObject thisv(cx);
scope->getProto<MongoExternalInfo>().newObject(&thisv);