mirror of https://github.com/mongodb/mongo
SERVER-105598: Make servers.js a module (#38495)
GitOrigin-RevId: 235ea01305ec39c1c681eb1158d6302c246f7fb9
This commit is contained in:
parent
d1f0f4f7f2
commit
4a359c01e6
|
|
@ -89,7 +89,7 @@ export default [
|
|||
QueryHelpers: true,
|
||||
___it___: true,
|
||||
|
||||
// src/mongo/shell/servers.d.ts
|
||||
// src/mongo/shell/servers_global.js
|
||||
MongoRunner: true,
|
||||
myPort: true,
|
||||
runMongoProgram: true,
|
||||
|
|
|
|||
|
|
@ -322,6 +322,7 @@ MONGO_SERVER_CPP_JS_FILES = [
|
|||
"feature_compatibility_version_global.js",
|
||||
"keyvault.js",
|
||||
"servers.js",
|
||||
"servers_global.js",
|
||||
"servers_misc.js",
|
||||
"servers_misc_global.js",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoProgramNoConnect,
|
||||
myPort;
|
||||
|
||||
(function() {
|
||||
"use strict";
|
||||
|
||||
const SIGTERM = 15;
|
||||
|
||||
var shellVersion = version;
|
||||
|
|
@ -1788,4 +1785,11 @@ myPort = function() {
|
|||
|
||||
return 27017;
|
||||
};
|
||||
}());
|
||||
|
||||
export {
|
||||
MongoRunner,
|
||||
myPort,
|
||||
runMongoProgram,
|
||||
startMongoProgram,
|
||||
startMongoProgramNoConnect,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
// Populate global variables from modules for backwards compatibility
|
||||
|
||||
import {
|
||||
MongoRunner,
|
||||
myPort,
|
||||
runMongoProgram,
|
||||
startMongoProgram,
|
||||
startMongoProgramNoConnect
|
||||
} from "src/mongo/shell/servers.js";
|
||||
|
||||
globalThis.MongoRunner = MongoRunner;
|
||||
globalThis.myPort = myPort;
|
||||
globalThis.runMongoProgram = runMongoProgram;
|
||||
globalThis.startMongoProgram = startMongoProgram;
|
||||
globalThis.startMongoProgramNoConnect = startMongoProgramNoConnect;
|
||||
|
|
@ -162,6 +162,7 @@ extern const JSFile data_consistency_checker_global;
|
|||
extern const JSFile feature_compatibility_version;
|
||||
extern const JSFile feature_compatibility_version_global;
|
||||
extern const JSFile servers;
|
||||
extern const JSFile servers_global;
|
||||
extern const JSFile servers_misc;
|
||||
extern const JSFile servers_misc_global;
|
||||
} // namespace JSFiles
|
||||
|
|
@ -1235,17 +1236,16 @@ void initScope(Scope& scope) {
|
|||
scope.execSetup(JSFiles::bridge);
|
||||
scope.execSetup(JSFiles::data_consistency_checker);
|
||||
scope.execSetup(JSFiles::feature_compatibility_version);
|
||||
scope.execSetup(JSFiles::servers);
|
||||
scope.execSetup(JSFiles::servers_misc);
|
||||
|
||||
// globals
|
||||
scope.execSetup(JSFiles::bridge_global);
|
||||
scope.execSetup(JSFiles::data_consistency_checker_global);
|
||||
scope.execSetup(JSFiles::feature_compatibility_version_global);
|
||||
scope.execSetup(JSFiles::servers_global);
|
||||
scope.execSetup(JSFiles::servers_misc_global);
|
||||
|
||||
// scripts
|
||||
scope.execSetup(JSFiles::servers);
|
||||
|
||||
initializeEnterpriseScope(scope);
|
||||
|
||||
scope.injectNative("benchRun", BenchRunner::benchRunSync); // alias
|
||||
|
|
|
|||
Loading…
Reference in New Issue