aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--apt-panopticommon.lua6
-rwxr-xr-xapt-panopticon-report-email-web.lua4
-rwxr-xr-xapt-panopticon.lua12
3 files changed, 11 insertions, 11 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 37b43e4..55f0e40 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -378,7 +378,7 @@ local log = function(v, t, s, prot, test, host)
378 end 378 end
379 end 379 end
380 if v <= APT.verbosity then 380 if v <= APT.verbosity then
381 if 3 <= APT.verbosity then t = os.date() .. " " .. t end 381 if 3 <= APT.verbosity then t = os.date('!%F %T') .. " " .. t end
382 print(t .. ": " .. s) 382 print(t .. ": " .. s)
383 end 383 end
384 if nil ~= APT.logFile then 384 if nil ~= APT.logFile then
@@ -390,9 +390,9 @@ local log = function(v, t, s, prot, test, host)
390 if 2 == v then colour = "blue " end -- TIMEOUT 390 if 2 == v then colour = "blue " end -- TIMEOUT
391 if 3 == v then colour = "white " end -- INFO 391 if 3 == v then colour = "white " end -- INFO
392 if 4 == v then colour = "gray " end -- DEBUG 392 if 4 == v then colour = "gray " end -- DEBUG
393 APT.logFile:write(os.date() .. " <font color='" .. colour .. "'><b>" .. t .. "</b></font>: " .. s .. "</br>\n") 393 APT.logFile:write(os.date('!%F %T') .. " <font color='" .. colour .. "'><b>" .. t .. "</b></font>: " .. s .. "</br>\n")
394 else 394 else
395 APT.logFile:write(os.date() .. " " .. t .. ": " .. s .. "\n") 395 APT.logFile:write(os.date('!%F %T') .. " " .. t .. ": " .. s .. "\n")
396 end 396 end
397 APT.logFile:flush() 397 APT.logFile:flush()
398 end 398 end
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 23608d3..42fb19e 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -198,7 +198,7 @@ if nil == email then C("opening mirrors file - " .. e) else
198 "Due to the nature of the tests, some errors or warnings will be \ncounted several times. " .. 198 "Due to the nature of the tests, some errors or warnings will be \ncounted several times. " ..
199 "Refer to the logs on the web page for details.\n\n" .. 199 "Refer to the logs on the web page for details.\n\n" ..
200 "Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" .. 200 "Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" ..
201 "==== package mirror status " .. os.date("!%Y-%m-%d %H:%M") .. " GMT ====\n" .. 201 "==== package mirror status " .. os.date("!%F %H:%M") .. " GMT ====\n" ..
202 "[skip] means that the test hasn't been written yet.\n\n") 202 "[skip] means that the test hasn't been written yet.\n\n")
203 for k, v in APT.orderedPairs(APT.mirrors) do 203 for k, v in APT.orderedPairs(APT.mirrors) do
204 email:write(k .. "....\n") 204 email:write(k .. "....\n")
@@ -345,7 +345,7 @@ if nil == web then C("opening mirrors file - " .. e) else
345 "<a href='https://pkgmaster.devuan.org/mirror_list.txt'>https://pkgmaster.devuan.org/mirror_list.txt</a></p>\n" .. 345 "<a href='https://pkgmaster.devuan.org/mirror_list.txt'>https://pkgmaster.devuan.org/mirror_list.txt</a></p>\n" ..
346 "<p>Due to the nature of the tests, some errors or warnings will be counted several times. &nbsp; " .. 346 "<p>Due to the nature of the tests, some errors or warnings will be counted several times. &nbsp; " ..
347 "The links in the table and DNS list go to the detailed testing logs.</p>\n\n" .. 347 "The links in the table and DNS list go to the detailed testing logs.</p>\n\n" ..
348 "<hr>\n<h2>==== package mirror status " .. os.date("!%Y-%m-%d %H:%M") .. " GMT ====</h2>\n" .. 348 "<hr>\n<h2>==== package mirror status " .. os.date("!%F %H:%M") .. " GMT ====</h2>\n" ..
349 349
350 "<p>[<font color='red'><b>FAILED</b></font>] or [<font color='lime'><b>OK</b></font>]" .. 350 "<p>[<font color='red'><b>FAILED</b></font>] or [<font color='lime'><b>OK</b></font>]" ..
351 " means the tested thing is supported for that mirror.</p>\n" .. 351 " means the tested thing is supported for that mirror.</p>\n" ..
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index b2827b4..ba5c064 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -1009,9 +1009,9 @@ else
1009 local fadt = io.popen("ls -dl results_old 2>/dev/null | cut -d '>' -f 2 | cut -d ' ' -f 2") 1009 local fadt = io.popen("ls -dl results_old 2>/dev/null | cut -d '>' -f 2 | cut -d ' ' -f 2")
1010 local adt = fadt:read('*l') 1010 local adt = fadt:read('*l')
1011 fadt:close() 1011 fadt:close()
1012 if nil ~= adt then os.execute('ionice -c3 nice -n 19 tar -c --xz ' .. adt .. ' -f ' .. adt .. '.tar.xz &') end 1012 if (nil ~= adt) and APT.checkFile(adt) then os.execute('ionice -c3 nice -n 19 tar -c --xz ' .. adt .. ' -f ' .. adt .. '.tar.xz &') end
1013 local dt = os.date('!%Y-%m-%d-%H-%M') 1013 local dt = os.date('!%F-%H-%M')
1014 local fodt = io.popen('TZ="GMT" date -r results/stamp +%Y-%m-%d-%H-%M 2>/dev/null', 'r') 1014 local fodt = io.popen('TZ="GMT" date -r results/stamp +%F-%H-%M 2>/dev/null', 'r')
1015 local odt = fodt:read('*l') 1015 local odt = fodt:read('*l')
1016 fodt:close() 1016 fodt:close()
1017 if nil ~= odt then os.execute(' rm -f results_old; ln -s results_' .. odt .. ' results_old 2>/dev/null') end 1017 if nil ~= odt then os.execute(' rm -f results_old; ln -s results_' .. odt .. ' results_old 2>/dev/null') end
@@ -1086,7 +1086,7 @@ os.execute('sleep 1') -- Wait for things to start up before checking for them.
1086 f = f:sub(9, -1) 1086 f = f:sub(9, -1)
1087 APT.logFile:write('<hr>\n<hr>\n<h2><a href="' .. f .. '">' .. f .. '</a></h2>\n') 1087 APT.logFile:write('<hr>\n<hr>\n<h2><a href="' .. f .. '">' .. f .. '</a></h2>\n')
1088 for l in io.lines('results/' .. f) do 1088 for l in io.lines('results/' .. f) do
1089 if l:match('^' .. os.date('%a %b %d ') .. '.*$') then APT.logFile:write(l .. '\n') end 1089 if l:match('^' .. os.date('%Y%-%m%-%d ') .. '.*$') then APT.logFile:write(l .. '\n') end
1090 end 1090 end
1091 end 1091 end
1092 APT.logPost() 1092 APT.logPost()
@@ -1102,7 +1102,7 @@ os.execute('sleep 1') -- Wait for things to start up before checking for them.
1102 g = g:sub(9, -1) 1102 g = g:sub(9, -1)
1103 APT.logFile:write('<hr>\n<hr>\n<h2><a href="' .. g .. '">' .. g .. '</a></h2>\n') 1103 APT.logFile:write('<hr>\n<hr>\n<h2><a href="' .. g .. '">' .. g .. '</a></h2>\n')
1104 for l in io.lines('results/' .. g) do 1104 for l in io.lines('results/' .. g) do
1105 if l:match('^' .. os.date('%a %b %d ') .. '.*$') then APT.logFile:write(l .. '\n') end 1105 if l:match('^' .. os.date('%Y%-%m%-%d ') .. '.*$') then APT.logFile:write(l .. '\n') end
1106 end 1106 end
1107 end 1107 end
1108 APT.logPost() 1108 APT.logPost()
@@ -1116,7 +1116,7 @@ os.execute('sleep 1') -- Wait for things to start up before checking for them.
1116 f = f:sub(9, -1) 1116 f = f:sub(9, -1)
1117 APT.logFile:write('<hr>\n<hr>\n<h2><a href="' .. f .. '">' .. f .. '</a></h2>\n') 1117 APT.logFile:write('<hr>\n<hr>\n<h2><a href="' .. f .. '">' .. f .. '</a></h2>\n')
1118 for l in io.lines('results/' .. f) do 1118 for l in io.lines('results/' .. f) do
1119 if l:match('^' .. os.date('%a %b %d ') .. '.*$') then APT.logFile:write(l .. '\n') end 1119 if l:match('^' .. os.date('%Y%-%m%-%d ') .. '.*$') then APT.logFile:write(l .. '\n') end
1120 end 1120 end
1121 end 1121 end
1122 APT.logPost() 1122 APT.logPost()