silkmvc/core/hook.lua

@@ -126,28 +126,17 @@ function loadscript(file, args)
     end
 end
 
-local __MSG = function(fmt,...)
+-- logging helpers
-    local va = {...}
-    local log_msg = fmt
-    local ret,msg = pcall(function() return string.format(fmt, table.unpack(va)) end)
-    if ret then
-       log_msg = msg
-    else
-        log_msg = string.format("Error processing format string [%s]: %s", fmt, msg)
-    end
-    return log_msg
-end
-
 function LOG_INFO(fmt, ...)
-    fcgio:log_info(__MSG(fmt or "INFO",table.unpack({...})))
+    fcgio:log_info(string.format(fmt or "LOG", ...))
 end
 
 function LOG_ERROR(fmt, ...)
-    fcgio:log_error(__MSG(fmt or "ERROR",table.unpack({...})))
+    fcgio:log_error(string.format(fmt or "ERROR", ...))
 end
 
 function LOG_DEBUG(fmt, ...)
-    fcgio:log_debug(__MSG(fmt or "DEBUG",table.unpack({...})))
+    fcgio:log_debug(string.format(fmt or "ERROR", ...))
 end
 
 function LOG_WARN(fmt, ...)

silkmvc/core/utils.lua

@@ -20,7 +20,7 @@ function utils.is_array(table)
     return true
 end
 
-function utils.escape(s, ignore_percent)
+function utils.escape(s)
     local replacements = {
         ["\\"] = "\\\\",
         ['"'] = '\\"',
@@ -28,11 +28,9 @@ function utils.escape(s, ignore_percent)
         ["\t"] = "\\t",
         ["\b"] = "\\b",
         ["\f"] = "\\f",
-        ["\r"] = "\\r"
+        ["\r"] = "\\r",
+        ["%"] = "%%"
     }
-    if not ignore_percent then
-        replacements["%"] = "%%"
-    end
     return (s:gsub("[\\'\"\n\t\b\f\r%%]", replacements))
 end
 
@@ -196,8 +194,7 @@ function JSON.encode(obj)
         end
     elseif t == 'string' then
         -- print('"'..utils.escape(obj)..'"')
-        -- ignore % escape as this is for a LUA using
+        return '"' .. utils.escape(obj) .. '"'
-        return '"' .. utils.escape(obj, true) .. '"'
     elseif t == 'boolean' or t == 'number' then
         return tostring(obj)
     elseif obj == nil then