Fix. Compatibility with lzmq-ffi

Author: moteus

lua/log/writer/async/_private/server.lua

@@ -49,12 +49,13 @@ end
 
 local Z
 local function run_zserver(server, maker, logformat, ctx, ...)
+  Z = Z or require "log.writer.net.zmq._private.compat"
+
   assert(type(server)    == 'string')
   assert(type(maker)     == 'string')
   assert(type(logformat) == 'string')
-  assert(type(ctx)       == 'userdata')
+  assert(Z.is_ctx(ctx))
 
-  Z = Z or require "log.writer.net.zmq._private.compat"
   local zthreads  = assert(Z.threads)
   local ok, err = zthreads.runstring(ctx, Worker, server, maker, logformat, ...)
   local child_thread = assert(zthreads.runstring(ctx, Worker, server, maker, logformat, ...))

lua/log/writer/async/server/zmq.lua

@@ -16,7 +16,7 @@ local function rand_str(n)
 end
 
 local function create_server(ctx, addr, maker, logformat)
-  if ctx and type(ctx) ~= 'userdata' then
+  if ctx and not Z.is_ctx(ctx) then
     ctx, addr, maker, logformat = nil, ctx, addr, maker
   end
   logformat = logformat or "log.logformat.default"

lua/log/writer/async/zmq.lua

@@ -1,7 +1,8 @@
+local Z      = require "log.writer.net.zmq._private.compat"
 local server = require "log.writer.async.server.zmq"
 
 local function create_writer(ctx, addr, maker)
-  if ctx and type(ctx) ~= 'userdata' then
+  if ctx and not Z.is_ctx(ctx) then
     ctx, addr, maker = nil, ctx, addr
   end
 

lua/log/writer/net/zmq/_private/compat.lua

@@ -8,6 +8,34 @@ local zstrerror, zassert, ETERM
 local zconnect, zbind
 local zrecv_all, zrecv
 
+
+local function has_member(t, key)
+  local ok, has
+  if type(key) == "table" then
+    ok, has = pcall(function()
+      for _, k in ipairs(key) do
+        if nil == t[k] then return false end
+      end
+      return true
+    end)
+  else
+    ok, has = pcall(function()
+      return nil ~= t[key]
+    end)
+  end
+  return ok and has
+end
+
+local function is_ctx(ctx)
+  local tname = type(ctx)
+  if (tname ~= 'table') and (tname ~= 'userdata') then
+    return false
+  end
+  return has_member(ctx, {
+    'socket', 'term'
+  })
+end
+
 zmq = prequire "lzmq"
 if zmq then
   zpoller   = prequire "lzmq.poller"
@@ -79,4 +107,5 @@ return {
   strerror = zstrerror;
   assert   = zassert;
   ETERM    = ETERM;
+  is_ctx   = is_ctx;
 }

lua/log/writer/net/zmq/_private/impl.lua

@@ -44,7 +44,7 @@ local function init(stype, is_srv)
   local M = {}
 
   function M.new(ctx, addr, timeout) 
-    if ctx and type(ctx) ~= 'userdata' then
+    if ctx and not Z.is_ctx(ctx) then
       ctx, addr, timeout = nil, ctx, addr
     end
 

utils/monitor.lua

@@ -14,12 +14,7 @@ local udp_bind_host = host
 local udp_bind_port = port
 
 local uskt = assert(socket.udp())
-if uskt.getfd then assert(uskt:setsockname(udp_bind_host, udp_bind_port))
-else 
-  print("UDP do not support!")
-  uskt:close()
-  uskt = nil
-end
+assert(uskt:setsockname(udp_bind_host, udp_bind_port))
 
 local ctx = zmq.init(1)
 local zskt = ctx:socket(zmq.SUB)
@@ -34,12 +29,10 @@ loop:add(zskt, zmq.POLLIN, function()
   else write('zmq://unknown', tostring(msg[1])) end
 end)
 
-if uskt then
-  loop:add(uskt:getfd(), zmq.POLLIN, function()
-    local msg, ip, port = uskt:receivefrom()
-    local name = 'udp://' .. ip .. ":" .. port
-    write(name, msg)
-  end)
-end
+loop:add(uskt:getfd(), zmq.POLLIN, function()
+  local msg, ip, port = uskt:receivefrom()
+  local name = 'udp://' .. ip .. ":" .. port
+  write(name, msg)
+end)
 
 loop:start()

utils/proxy_monitor.lua

@@ -20,12 +20,7 @@ local udp_bind_host = host
 local udp_bind_port = port
 
 local uskt = assert(socket.udp())
-if uskt.getfd then assert(uskt:setsockname(udp_bind_host, udp_bind_port))
-else 
-  print("UDP do not support!")
-  uskt:close()
-  uskt = nil
-end
+assert(uskt:setsockname(udp_bind_host, udp_bind_port))
 
 local ctx = zmq.init(1)
 local zskt = ctx:socket(zmq.PULL)
@@ -38,11 +33,9 @@ loop:add(zskt, zmq.POLLIN, function()
   write(msg[1])
 end)
 
-if uskt then
-  loop:add(uskt:getfd(), zmq.POLLIN, function()
-    local msg, ip, port = uskt:receivefrom()
-    write(msg)
-  end)
-end
+loop:add(uskt:getfd(), zmq.POLLIN, function()
+  local msg, ip, port = uskt:receivefrom()
+  write(msg)
+end)
 
 loop:start()