SERVER-52943 Add a sharding variant for the Audit Log Spooler

2 files changed, 22 insertions, 0 deletions

diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index f11f9436900..fb0cea95612 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -761,6 +761,11 @@ MongoRunner.mongodOptions = function(opts = {}) {
         opts.auditDestination = jsTestOptions().auditDestination;
     }
 
+    if (opts.hasOwnProperty("auditPath")) {
+        // We need to reformat the auditPath to include the proper port
+        opts.auditPath = MongoRunner.toRealPath(opts.auditPath, opts);
+    }
+
     if (opts.noReplSet)
         opts.replSet = null;
     if (opts.arbiter)
@@ -819,6 +824,11 @@ MongoRunner.mongosOptions = function(opts) {
         opts.binVersion = MongoRunner.getBinVersionFor(testOptions.mongosBinVersion);
     }
 
+    if (opts.hasOwnProperty("auditPath")) {
+        // We need to reformat the auditPath to include the proper port
+        opts.auditPath = MongoRunner.toRealPath(opts.auditPath, opts);
+    }
+
     _removeSetParameterIfBeforeVersion(
         opts, "mongosShutdownTimeoutMillisForSignaledShutdown", "4.5.0", true);
 
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 723e94d1b96..b77131ab170 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -474,6 +474,18 @@ var ShardingTest = function(params) {
         });
     };
 
+    this.forEachMongos = function(fn) {
+        this._mongos.forEach(function(conn) {
+            fn(conn);
+        });
+    };
+
+    this.forEachConfigServer = function(fn) {
+        this._configServers.forEach(function(conn) {
+            fn(conn);
+        });
+    };
+
     this.printChangeLog = function() {
         this.config.changelog.find().forEach(function(z) {
             var msg = z.server + "\t" + z.time + "\t" + z.what;