SERVER-47077 Clean up log lines in 'mongo/db'

Cleaning up log lines to adhere to the LOGV2 style guide.

(cherry picked from commit 777f54aab1b1fd9b2db1f416a28755b31e1a4662)

4 files changed, 9 insertions, 11 deletions

diff --git a/jstests/replsets/read_after_optime.js b/jstests/replsets/read_after_optime.js
index 079a0c55c60..5673846d31d 100644
--- a/jstests/replsets/read_after_optime.js
+++ b/jstests/replsets/read_after_optime.js
@@ -41,9 +41,9 @@ var runTest = function(testDB, primaryConn) {
         ' timed out waiting for read concern to be satisfied. Command:';
 
     if (isJsonLog(testDB.getMongo())) {
-        msg = new RegExp(
-            `Command on database {request_getDatabase} timed out waiting for read concern to be satisfied. Command:.*"attr":{"request_getDatabase":"${
-                testDB.getName()}",.*`);
+        msg =
+            new RegExp(`Command timed out waiting for read concern to be satisfied.*"attr":{"db":"${
+                testDB.getName()}",*`);
     }
 
     checkLog.containsWithCount(testDB.getMongo(), msg, 1);
diff --git a/jstests/sharding/lagged_config_secondary.js b/jstests/sharding/lagged_config_secondary.js
index 8cfbc06fd8d..172c8cd7764 100644
--- a/jstests/sharding/lagged_config_secondary.js
+++ b/jstests/sharding/lagged_config_secondary.js
@@ -49,10 +49,9 @@ assert(ErrorCodes.isExceededTimeLimitError(exception.code));
 
 let msgAA = 'command config.$cmd command: find { find: "databases"';
 let msgAB = 'errCode:' + ErrorCodes.ClientDisconnect;
-let msgB = 'Command on database config timed out waiting for read concern to be satisfied.';
+let msgB = 'Command on database config timed out waiting for read concern to be satisfied';
 if (isJsonLogNoConn()) {
-    msgB =
-        /Command on database {request_getDatabase} timed out waiting for read concern to be satisfied.*"request_getDatabase":"config"/;
+    msgB = /Command timed out waiting for read concern to be satisfied.*"db":"config"/;
 }
 
 assert.soon(
diff --git a/jstests/sharding/read_after_optime.js b/jstests/sharding/read_after_optime.js
index e5ebe321940..12973752ddf 100644
--- a/jstests/sharding/read_after_optime.js
+++ b/jstests/sharding/read_after_optime.js
@@ -36,10 +36,9 @@ assert.commandFailedWithCode(
     runFindCommand(new Timestamp(lastOp.ts.getTime() + pingIntervalSeconds * 5, 0)),
     ErrorCodes.MaxTimeMSExpired);
 
-var msg = 'Command on database local timed out waiting for read concern to be satisfied.';
+var msg = 'Command on database local timed out waiting for read concern to be satisfied';
 if (isJsonLogNoConn()) {
-    msg =
-        /Command on database {request_getDatabase} timed out waiting for read concern to be satisfied.*"request_getDatabase":"local"/;
+    msg = /Command timed out waiting for read concern to be satisfied.*"db":"local"/;
 }
 
 assert.soon(function() {
diff --git a/jstests/ssl/x509_startup_warning.js b/jstests/ssl/x509_startup_warning.js
index 901ff08035d..32ef4338d5a 100644
--- a/jstests/ssl/x509_startup_warning.js
+++ b/jstests/ssl/x509_startup_warning.js
@@ -29,10 +29,10 @@ function runTest(checkMongos, opts, expectWarningCertifcates, expectWarningHostn
         return (
             expectWarningCertifcates ==
                 output.includes(
-                    'While invalid X509 certificates may be used to connect to this server, they will not be considered permissible for authentication.') &&
+                    'While invalid X509 certificates may be used to connect to this server, they will not be considered permissible for authentication') &&
             expectWarningHostnames ==
                 output.includes(
-                    'This server will not perform X.509 hostname validation. This may allow your server to make or accept connections to untrusted parties.'));
+                    'This server will not perform X.509 hostname validation. This may allow your server to make or accept connections to untrusted parties'));
     });
 
     stopMongoProgramByPid(mongo.pid);