Do not pretty format log arguments

This is bad because it quotes all strings although most of the times we
don't need it. This also makes `luatest.log` work differently from the
built-in logger while we want them to be interchangeable.

We don't need pretty-printing anymore because we don't log assertion
arguments. If the caller needs pretty-printing, they can do it manually.

This effectively reverts commit 15dbf75 ("Improve luatest.log
function if a nil value is passed") and a good part of commit
a005329 ("Add syntax sugar for more convenient logging").

Author: locker

CHANGELOG.md

@@ -4,7 +4,6 @@
 
 - Add logging to unified file (gh-324).
 - Add memory leak detection during server process execution (gh-349).
-- Improve `luatest.log` function if a `nil` value is passed (gh-360).
 - Added `assert_error_covers`.
 - Add more logs (gh-326).
 - Add `justrun` helper as a tarantool runner and output catcher (gh-365).
@@ -23,6 +22,7 @@
 - Strip useless `...` lines from error trace.
 - Fix error trace reporting for functions executed with `Server:exec()`
   (gh-396).
+- Remove pretty-printing of `luatest.log` arguments.
 
 ## 1.0.1
 

luatest/log.lua

@@ -1,22 +1,15 @@
 local tarantool_log = require('log')
 
 local utils = require('luatest.utils')
-local pp = require('luatest.pp')
 
 -- Utils for logging
 local log = {}
 local default_level = 'info'
 
 local function _log(level, msg, ...)
-    if not utils.version_current_ge_than(2, 5, 1) then
-        return
+    if utils.version_current_ge_than(2, 5, 1) then
+        return tarantool_log[level](msg, ...)
     end
-    local args = {}
-    for i = 1, select('#', ...) do
-        local v = select(i, ...)
-        table.insert(args, pp.tostringlog(v))
-    end
-    return tarantool_log[level](msg, unpack(args))
 end
 
 --- Extra wrapper for `__call` function

luatest/pp.lua

@@ -21,7 +21,7 @@ local TABLE_TOSTRING_SEP_LEN = string.len(TABLE_TOSTRING_SEP)
 
 -- Final function called in format_table() to format the resulting list of
 -- string describing the table.
-local function _table_tostring_format_result(tbl, result, indentLevel, printTableRefs, isLogLine)
+local function _table_tostring_format_result(tbl, result, indentLevel, printTableRefs)
     local dispOnMultLines = false
 
     -- set dispOnMultLines to true if the maximum LINE_LENGTH would be exceeded with the values
@@ -46,7 +46,7 @@ local function _table_tostring_format_result(tbl, result, indentLevel, printTabl
     end
 
     -- now reformat the result table (currently holding element strings)
-    if dispOnMultLines and not isLogLine then
+    if dispOnMultLines then
         local indentString = string.rep("    ", indentLevel - 1)
         result = {
             "{\n    ",
@@ -77,7 +77,7 @@ function Formatter.mt:initialize(printTableRefs)
     self.recursionTable = {}
 end
 
-function Formatter.mt:format_table(tbl, indentLevel, isLogLine)
+function Formatter.mt:format_table(tbl, indentLevel)
     indentLevel = indentLevel or 1
     self.recursionTable[tbl] = true
 
@@ -133,16 +133,16 @@ function Formatter.mt:format_table(tbl, indentLevel, isLogLine)
             count = count + 1
             result[count] = entry
         end
-        return _table_tostring_format_result(tbl, result, indentLevel, self.printTableRefs, isLogLine)
+        return _table_tostring_format_result(tbl, result, indentLevel, self.printTableRefs)
     end
 end
 
-function Formatter.mt:format(v, indentLevel, isLogLine)
+function Formatter.mt:format(v, indentLevel)
     local type_v = type(v)
     if "string" == type_v  then
         return string.format("%q", v)
     elseif "table" == type_v then
-        return self:format_table(v, indentLevel, isLogLine)
+        return self:format_table(v, indentLevel)
     elseif "number" == type_v then
         -- eliminate differences in formatting between various Lua versions
         if v ~= v then
@@ -169,24 +169,18 @@ end
 --
 -- * string are enclosed with " by default, or with ' if string contains a "
 -- * tables are expanded to show their full content, with indentation in case of nested tables
-function pp.tostring(value, is_logline)
+function pp.tostring(value)
     local formatter = Formatter:new(pp.TABLE_REF_IN_ERROR_MSG)
-    local result = formatter:format(value, nil, is_logline)
+    local result = formatter:format(value)
     if formatter.recursionDetected and not pp.TABLE_REF_IN_ERROR_MSG then
         -- some table contain recursive references,
         -- so we must recompute the value by including all table references
         -- else the result looks like crap
-        return Formatter:new(true):format(value, nil, is_logline)
+        return Formatter:new(true):format(value)
     end
     return result
 end
 
--- This function helps with displaying `value` of any type without line breaks ('\n')
--- for logging. It is a simple wrapper over the tostring() function.
-function pp.tostringlog(value)
-    return pp.tostring(value, true)
-end
-
 local function has_new_line(s)
     return (string.find(s, '\n', 1, true) ~= nil)
 end