af123/webif
1
0
Fork 0
forked from hummypkg/webif
Code Issues Pull Requests Releases Wiki Activity

Catch errors from stat that might cause automatic processing to stall

Browse Source
This commit is contained in:
HummyPkg 2020-01-25 17:00:28 +00:00
parent f77d11f3fc
commit d14ccef3bf
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTROL/postinst
View File

@ -21,8 +21,8 @@ if [ -x $crontab ]; then
$crontab -l | grep -v webif/lib/bin/auto \ $crontab -l | grep -v webif/lib/bin/auto \
| grep -v webif/lib/auto > $tmpf | grep -v webif/lib/auto > $tmpf
cat $tmpf - << EOM | $crontab - cat $tmpf - << EOM | $crontab -
* * * * * /mod/webif/lib/auto/scan >/dev/null 2>&1 * * * * * /mod/webif/lib/auto/scan >/dev/null 2>>/mod/tmp/auto.log
* * * * * /mod/webif/lib/auto/deq >/dev/null 2>&1 * * * * * /mod/webif/lib/auto/deq >/dev/null 2>>/mod/tmp/auto.log
EOM EOM
fi fi

22
webif/lib/auto/scan
View File

@ -121,35 +121,39 @@ proc ::auto::buildflagdb {dir {active {}}} {{seen {}} {indent 0}} {
variable rootdev variable rootdev
incr indent 2 incr indent 2
log "[string repeat " " $indent]\[$dir]" 3 set pre [string repeat " " $indent]
log "${pre}\[$dir]" 3
if {$dir eq $dustbin} { if {$dir eq $dustbin} {
log "[string repeat " " $indent]Dustbin, skipping." 3 log "${pre}Dustbin, skipping." 3
incr indent -2 incr indent -2
return return
} }
file stat "$dir/" st if {[catch {file stat "$dir/" st} msg]} {
log "${pre}Can't stat $dir - $msg, skipping.." 2
incr indent -2
return
}
if {[specialdir $dir]} { if {[specialdir $dir]} {
# Special folder # Special folder
if {$st(dev) != $rootdev} { if {$st(dev) != $rootdev} {
log "[string repeat " " $indent\ log "${pre}Special folder on different device, skipping." 3
]Special folder on different device, skipping." 3
incr indent -2 incr indent -2
return return
} }
if {[llength $active]} { if {[llength $active]} {
set active {} set active {}
log "[string repeat " " $indent\ log "${pre}Special folder, overriding recursion." 3
]Special folder, overriding recursion." 3
} }
} }
# Already seen # Already seen
set key "$st(dev):$st(ino)" set key "$st(dev):$st(ino)"
if {$key in $seen} { if {$key in $seen} {
log "[string repeat " " $indent]Already seen, skipping." 3 log "${pre}Already seen, skipping." 3
incr indent -2 incr indent -2
return return
} }
@ -181,7 +185,7 @@ proc ::auto::buildflagdb {dir {active {}}} {{seen {}} {indent 0}} {
if {[llength $flags]} { if {[llength $flags]} {
lappend flagdb $dir $flags lappend flagdb $dir $flags
log "[string repeat " " $indent] $flags" 3 log "${pre} $flags" 3
foreach f $flags { ladd activeflags $f } foreach f $flags { ladd activeflags $f }
} }