vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-12-22 19:13:49 +01:00
Code Issues Releases Wiki Activity

Fix logfile saving if ultifi path does not exist; fix http response consistency.

Browse Source
This commit is contained in:
Wouter R 2013-08-21 13:39:45 +02:00
parent d59d2da938
commit dfb16a9b32
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rest/api/api_info.lua
View File

@ -38,6 +38,8 @@ function M.logfiles(request, response)
local rv,msg = lfs.mkdir(LOG_COLLECT_DIR) local rv,msg = lfs.mkdir(LOG_COLLECT_DIR)
local rv,msg = lfs.chdir(TMP_DIR) local rv,msg = lfs.chdir(TMP_DIR)
local ultip,msg = lfs.attributes(ULTIFI_PATH, 'mode')
--[[ create temporary files ]]-- --[[ create temporary files ]]--
@ -45,11 +47,13 @@ function M.logfiles(request, response)
local rv,sig,code = os.execute('logread > ' .. LOG_COLLECT_DIR .. '/' .. SYSLOG_FILENAME) local rv,sig,code = os.execute('logread > ' .. LOG_COLLECT_DIR .. '/' .. SYSLOG_FILENAME)
for file in lfs.dir(ULTIFI_PATH) do if ultip and ultip == 'directory' then
if file ~= '.' and file ~= '..' then for file in lfs.dir(ULTIFI_PATH) do
local srcLogFile = ULTIFI_PATH .. '/' .. file .. '/' .. ULTIFI_LOG_FILENAME if file ~= '.' and file ~= '..' then
local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file .. '-' .. ULTIFI_LOG_FILENAME local srcLogFile = ULTIFI_PATH .. '/' .. file .. '/' .. ULTIFI_LOG_FILENAME
local rv,sig,code = redirectedExecute('cp ' .. srcLogFile .. ' ' .. tgtLogFile) local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file .. '-' .. ULTIFI_LOG_FILENAME
local rv,sig,code = redirectedExecute('cp ' .. srcLogFile .. ' ' .. tgtLogFile)
end
end end
end end
@ -68,10 +72,12 @@ function M.logfiles(request, response)
--[[ remove temporary files ]]-- --[[ remove temporary files ]]--
for file in lfs.dir(ULTIFI_PATH) do if ultip and ultip == 'directory' then
if file ~= '.' and file ~= '..' then for file in lfs.dir(ULTIFI_PATH) do
local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file .. '-' .. ULTIFI_LOG_FILENAME if file ~= '.' and file ~= '..' then
local rv,sig,code = redirectedExecute('rm ' .. tgtLogFile) local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file .. '-' .. ULTIFI_LOG_FILENAME
local rv,sig,code = redirectedExecute('rm ' .. tgtLogFile)
end
end end
end end

4
src/rest/response.lua
View File

@ -88,14 +88,14 @@ end
function M:send() function M:send()
printHeaderLine("Status", self.httpStatusCode .. " " .. self.httpStatusText) printHeaderLine("Status", self.httpStatusCode .. " " .. self.httpStatusText)
printHeaderLine("Content-type", self.contentType) printHeaderLine("Content-Type", self.contentType)
printHeaderLine("Access-Control-Allow-Origin", "*") printHeaderLine("Access-Control-Allow-Origin", "*")
if self.binaryData == nil then if self.binaryData == nil then
io.write("\r\n") io.write("\r\n")
print(self:serializeAsJson()) print(self:serializeAsJson())
else else
printHeaderLine("content-disposition", "attachment;filename=" .. self.binarySavename) printHeaderLine("Content-Disposition", "attachment; filename=" .. self.binarySavename)
io.write("\r\n") io.write("\r\n")
io.write(self.binaryData) io.write(self.binaryData)
end end