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

Merge pull request #91 from HHHartmann/BetterLoggingAndMoreCloseConnections

Browse Source 
Improve logging and cleanup when ConnectionThread failes
This commit is contained in:
Marcos 2017-05-31 21:43:23 -05:00 committed by GitHub
commit a09b4b4758
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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 connection", "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 connection", "error")
connection:close()
connectionThread = nil
collectgarbage()
end
end
local function handleRequest(connection, req)
@ -139,16 +147,26 @@ 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 connection", "error")
connection:close()
connectionThread = nil
collectgarbage()
end
elseif connectionThreadStatus == "dead" then
-- We're done sending file.
log(connection, "closing connection","thread is dead")
connection:close()
connectionThread = nil
collectgarbage()
end
end
end
local function onDisconnect(connection, payload)
-- this should rather be a log call, but log is not available here
-- print("disconnected")
if connectionThread then
connectionThread = nil
collectgarbage()