Skip to content

Commit

Permalink
合并代码
Browse files Browse the repository at this point in the history
  • Loading branch information
xiyoo0812 committed Nov 10, 2023
1 parent 733290e commit e27e9b3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion script/queue/redis_mq.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end
-- 获取消息长度
function RedisMQ:len_message(target_id)
local zset_name = sformat("%s:%s", self.prefix, target_id)
local ok, code, result = redis_agent:execute({ "LLEN", zset_name})
local ok, code, result = redis_agent:execute({ "ZCARD", zset_name})
if qsuccess(code, ok) then
return result
end
Expand Down
3 changes: 1 addition & 2 deletions server/gateway/gateway.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ local log_err = logger.err
local log_info = logger.info
local log_warn = logger.warn
local log_debug = logger.debug
local tpack = table.pack
local qfailed = quanta.failed
local sformat = string.format
local name2sid = service.name2sid
Expand Down Expand Up @@ -223,7 +222,7 @@ function Gateway:on_heartbeat_req(session, cmd_id, body, session_id)
end

function Gateway:call_lobby(lobby, rpc, player_id, ...)
local ok, codeore, res = tpack(router_mgr:call_target_hash(lobby, player_id, rpc, player_id, ...))
local ok, codeore, res = router_mgr:call_target_hash(lobby, player_id, rpc, player_id, ...)
if not ok then
return FRAME_FAILED, codeore
end
Expand Down

0 comments on commit e27e9b3

Please sign in to comment.