diff options
author | onefang | 2023-02-23 02:48:09 +1000 |
---|---|---|
committer | onefang | 2023-02-23 02:48:09 +1000 |
commit | 769aafaaad11da562983448da42b8c53402ca9a1 (patch) | |
tree | 004e83ec27273dd79f1ddd8cb5fc46014ffb5e24 | |
parent | Add yet another timeout watchdog. (diff) | |
download | apt-panopticon-769aafaaad11da562983448da42b8c53402ca9a1.zip apt-panopticon-769aafaaad11da562983448da42b8c53402ca9a1.tar.gz apt-panopticon-769aafaaad11da562983448da42b8c53402ca9a1.tar.bz2 apt-panopticon-769aafaaad11da562983448da42b8c53402ca9a1.tar.xz |
The -v option for timeout is new, not everyone has it.
-rw-r--r-- | apt-panopticommon.lua | 4 | ||||
-rwxr-xr-x | update_apt-panopticon | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua index a2def5a..04a339a 100644 --- a/apt-panopticommon.lua +++ b/apt-panopticommon.lua | |||
@@ -547,9 +547,9 @@ APT.exe = function(c) | |||
547 | -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well. | 547 | -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well. |
548 | -- --kill-after means "send KILL after TERM fails. | 548 | -- --kill-after means "send KILL after TERM fails. |
549 | if nil == c then | 549 | if nil == c then |
550 | self.cmd = 'timeout --kill-after=10.0 --foreground -v 42.0s ' .. self.cmd | 550 | self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd |
551 | else | 551 | else |
552 | self.cmd = 'timeout --kill-after=10.0 --foreground -v ' .. c .. ' ' .. self.cmd | 552 | self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd |
553 | end | 553 | end |
554 | return self | 554 | return self |
555 | end | 555 | end |
diff --git a/update_apt-panopticon b/update_apt-panopticon index abbc154..180f090 100755 --- a/update_apt-panopticon +++ b/update_apt-panopticon | |||
@@ -29,7 +29,7 @@ if [ -f apt-panopticon.lock ] ; then | |||
29 | fi | 29 | fi |
30 | 30 | ||
31 | rm ../results; ln -s apt-panopticon/results_old ../results | 31 | rm ../results; ln -s apt-panopticon/results_old ../results |
32 | flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground -v 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock | 32 | flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock |
33 | if [ -f apt-panopticon.lock ] ; then | 33 | if [ -f apt-panopticon.lock ] ; then |
34 | echo "apt-panopticon timed out." | 34 | echo "apt-panopticon timed out." |
35 | ./laggers | 35 | ./laggers |