godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve Connection Close handling

Browse Source 
close connection on coroutine errors and improve logging around closieg
connections.
Release memory warlier
This commit is contained in:
Gregor 2017-05-29 21:25:35 +02:00
parent 90cb4e47aa
commit e4d829b6c9
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
httpserver.lua
View File

@ -31,15 +31,23 @@ return function (port)
fileServeFunction(bufferedConnection, req, args)
-- The bufferedConnection may still hold some data that hasn't been sent. Flush it before closing.
if not bufferedConnection:flush() then
log(connection, "closing connetion", "no (more) data")
connection:close()
connectionThread = nil
collectgarbage()
end
end)
local BufferedConnectionClass = dofile("httpserver-connection.lc")
local bufferedConnection = BufferedConnectionClass:new(connection)
local status, err = coroutine.resume(connectionThread, fileServeFunction, bufferedConnection, req, args)
if not status then log(connection, "Error: "..err) end
if not status then
log(connection, "Error: "..err)
log(connection, "closing connetion", "error")
connection:close()
connectionThread = nil
collectgarbage()
end
end
local function handleRequest(connection, req)
@ -139,16 +147,25 @@ return function (port)
if connectionThreadStatus == "suspended" then
-- Not finished sending file, resume.
local status, err = coroutine.resume(connectionThread)
if not status then log(connection:getpeer(), "Error: " .. err) end
elseif connectionThreadStatus == "dead" then
-- We're done sending file.
if not status then
log(connection, "Error: "..err)
log(connection, "closing connetion", "error")
connection:close()
connectionThread = nil
collectgarbage()
end
elseif connectionThreadStatus == "dead" then
-- We're done sending file.
log(connection, "closing connetion","thread is dead")
connection:close()
connectionThread = nil
collectgarbage()
end
end
end
local function onDisconnect(connection, payload)
print("disconnected")
if connectionThread then
connectionThread = nil
collectgarbage()