lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

redis driver: unlock before assert failed

Browse Source
This commit is contained in:
云风
2013-08-22 18:09:45 +08:00
parent e074076c8d
commit 4d8390ba66
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lualib/redis.lua
View File

@@ -155,8 +155,8 @@ function command:batch(mode)
allok = allok and ok allok = allok and ok
allret[i] = ret allret[i] = ret
end end
assert(allok, "batch read failed")
socket.unlock(self.__handle) socket.unlock(self.__handle)
assert(allok, "batch read failed")
self.__mode = false self.__mode = false
return allret return allret
else else

2
lualib/socket.lua
View File

@@ -142,7 +142,6 @@ function socket.accept(id)
end end
function socket.close(fd) function socket.close(fd)
-- socket.lock(fd)
local s = socket_pool[id] local s = socket_pool[id]
if s == nil then if s == nil then
return return
@@ -154,6 +153,7 @@ function socket.close(fd)
if s.buffer then if s.buffer then
driver.clear(s.buffer) driver.clear(s.buffer)
end end
assert(s.lock_set == nil or next(s.lock_set) == nil)
socket_pool[id] = nil socket_pool[id] = nil
end end