Merge branch 'develop'5.1.2

1 files changed, 23 insertions, 2 deletions

diff --git a/misc/freeswitch/scripts/common/log.lua b/misc/freeswitch/scripts/common/log.lua
index b7c8d09..b9893ac 100644
--- a/misc/freeswitch/scripts/common/log.lua
+++ b/misc/freeswitch/scripts/common/log.lua
@@ -12,6 +12,8 @@ function Log.new(self, arg)
   object = arg.object or {}
   setmetatable(object, self);
   self.__index = self;
+  self.disabled = arg.disabled or false;
+  self.buffer = arg.buffer;
   self.prefix = arg.prefix or '### ';
 
   self.level_console  = arg.level_console  or 0;
@@ -22,18 +24,31 @@ function Log.new(self, arg)
   self.level_notice   = arg.level_notice   or 5;
   self.level_info     = arg.level_info     or 6;
   self.level_debug    = arg.level_debug    or 7;
+  self.level_devel    = arg.level_devel    or 4;
 
   return object;
 end
 
 function Log.message(self, log_level, message_arguments )
+  if self.disabled then
+    return
+  end
   local message = tostring(self.prefix);
   for index, value in pairs(message_arguments) do
     if type(index) == 'number' then
-      message = message .. tostring(value);
+      if type(value) == 'table' then
+        require 'common.array';
+        message = message .. common.array.to_json(value);
+      else
+        message = message .. tostring(value);
+      end
     end
   end
-  freeswitch.consoleLog(log_level, message .. '\n');
+  if self.buffer then
+    table.insert(self.buffer, message);
+  elseif freeswitch then
+    freeswitch.consoleLog(log_level, message .. '\n');
+  end
 end
 
 function Log.console(self, ...)
@@ -67,3 +82,9 @@ end
 function Log.debug(self, ...)
   self:message(self.level_debug, {...});
 end
+
+function Log.devel(self, ...)
+  local arguments = {...};
+  table.insert(arguments, 1, '**');
+  self:message(self.level_devel, arguments);
+end