Revert "SERVER-17358 Add flag to customize maxLogLine when logging large lines"

This reverts commit 7c6c92e3cd514a156a49ae9e5139ea66d324c004.

1 files changed, 23 insertions, 42 deletions

diff --git a/jstests/core/loglong.js b/jstests/core/loglong.js
index 053d8558613..0447d915d10 100644
--- a/jstests/core/loglong.js
+++ b/jstests/core/loglong.js
@@ -1,53 +1,34 @@
 // test for SERVER-5013
 // make sure very long long lines get truncated
 
-(function() {
-    "use strict";
+t = db.loglong;
+t.drop();
 
-    const options = {setParameter: "maxLogSizeKB=9", enableMajorityReadConcern: ""};
-    const conn = MongoRunner.runMongod(options);
+t.insert({x: 1});
 
-    var db = conn.getDB('db');
-    var res = db.adminCommand({getParameter: 1, maxLogSizeKB: 1});
-    assert.eq(9, res.maxLogSizeKB);
+n = 0;
+query = {
+    x: []
+};
+while (Object.bsonsize(query) < 30000) {
+    query.x.push(n++);
+}
 
-    var t = db.loglong;
-    t.drop();
+before = db.adminCommand({setParameter: 1, logLevel: 1});
 
-    t.insert({x: 1});
+t.findOne(query);
 
-    var n = 0;
-    var query = {x: []};
-    while (Object.bsonsize(query) < 30000) {
-        query.x.push(n++);
-    }
-
-    assertLogTruncated(db, t, 9);
-
-    var res = db.adminCommand({setParameter: 1, maxLogSizeKB: 8});
-    assert.eq(res.ok, 1);
-
-    assertLogTruncated(db, t, 8);
-
-    function assertLogTruncated(db, t, maxLogSize) {
-        var before = db.adminCommand({setParameter: 1, logLevel: 1});
+x = db.adminCommand({setParameter: 1, logLevel: before.was});
+assert.eq(1, x.was, tojson(x));
 
-        t.findOne(query);
+log = db.adminCommand({getLog: "global"}).log;
 
-        var x = db.adminCommand({setParameter: 1, logLevel: before.was});
-        assert.eq(1, x.was, tojson(x));
-
-        var log = db.adminCommand({getLog: "global"}).log;
-
-        var found = false;
-        var toFind = "warning: log line attempted (16kB) over max size (" + maxLogSize + "kB)";
-        for (var i = log.length - 1; i >= 0; i--) {
-            if (log[i].indexOf(toFind) >= 0) {
-                found = true;
-                break;
-            }
-        }
-
-        assert(found, tojson(log));
+found = false;
+for (i = log.length - 1; i >= 0; i--) {
+    if (log[i].indexOf("warning: log line attempted (16kB)") >= 0) {
+        found = true;
+        break;
     }
-})();
\ No newline at end of file
+}
+
+assert(found, tojson(log));