From 8f97679836d9d03b687cb854dbda52a8fbf9823f Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Sat, 20 Apr 2013 16:34:23 +0200 Subject: tail: exit following by descriptor when no tailable file left As a side effect of the previous commit which fixes 'tail -f --retry' to wait for a file to appear, tail would not exit when the last file appears untailable and gives up on this file. This can happen, for example, when the argument file name appears as directory. Tail sets the 'ignore' flag of this file to true, but instead of exiting the program, tail would continue the loop. * src/tail.c (any_live_files): Change the function to return true if any of the files is still tailable or if tail should continue to try to check again. (tail_forever): Change the condition to break the loop in the "no files remaining" case, because now any_live_files() will care about it, as mentioned above. (parse_options): When --retry is used without any follow mode, then reset reopen_inaccessible_files to false. * tests/tail-2/retry.sh: Add test case. --- tests/tail-2/retry.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests') diff --git a/tests/tail-2/retry.sh b/tests/tail-2/retry.sh index 71d101556..d56d4c169 100644 --- a/tests/tail-2/retry.sh +++ b/tests/tail-2/retry.sh @@ -75,6 +75,24 @@ grep -F 'has appeared' out || { fail=1; cat out; } grep '^X$' out || { fail=1; cat out; } rm -f missing out || fail=1 +# === Test: +# Ensure that tail --follow=descriptor --retry exits when the file appears +# untailable. Expect exit status 1. +timeout 10 tail -s.1 --follow=descriptor --retry missing >out 2>&1 & pid=$! +retry_delay_ wait4lines_ .1 6 2 || fail=1 # Wait for "cannot open" error. +mkdir missing || fail=1 # Create untailable 'missing'. +retry_delay_ wait4lines_ .1 6 4 || fail=1 # Wait for the expected output. +wait $pid +rc=$? +[ $( wc -l < out ) = 4 ] || { fail=1; cat out; } +grep -F 'retry only effective for the initial open' out \ + || { fail=1; cat out; } +grep -F 'cannot open' out || { fail=1; cat out; } +grep -F 'replaced with an untailable file' out || { fail=1; cat out; } +grep -F 'no files remaining' out || { fail=1; cat out; } +[ $rc = 1 ] || { fail=1; cat out; } +rm -fd missing out || fail=1 + # === Test: # Ensure that --follow=descriptor (without --retry) does *not wait* for the # file to appear. Expect 2 lines in the output file ("cannot open" + -- cgit v1.2.3-54-g00ecf