Set default verbosity level to 1

This means warnings always show warnings, which is the right thing to do
considering the 2 warnings we show are actually for important
information.
pull/7/head
Thomas Orozco 10 years ago
parent bcb8a4b870
commit 376d186b2e
  1. 5
      README.md
  2. 4
      ci/run_build.sh
  3. 4
      src/tini.c
  4. 2
      test/run_outer_tests.py
  5. 5
      tpl/README.md.in

@ -49,7 +49,7 @@ looks like `tini: invalid option -- 'c'`, then you *need* to add the `--`.
Arguments Tini itself are passed like so: `/tini -v -- /your/program`.
The only supported argument at this time is `-v`, for extra verbosity (you can
pass it up to 4 times, e.g. `-vvvv`).
pass it up to 3 times, e.g. `-vvv`).
*NOTE: The binary linked above is a 64-bit dynamically-linked binary.*
@ -103,12 +103,11 @@ Debugging
---------
If something isn't working just like you expect, consider increasing the
verbosity level (up to 4):
verbosity level (up to 3):
tini -v -- bash -c 'exit 1'
tini -vv -- true
tini -vvv -- pwd
tini -vvvv -- ls
[10]: https://github.com/krallin/tini-images

@ -39,10 +39,10 @@ popd
# Smoke tests (actual tests need Docker to run; they don't run within the CI environment)
for tini in "${BUILD_DIR}/tini" "${BUILD_DIR}/tini-static"; do
echo "Testing $tini with: true"
$tini -vvvv true
$tini -vvv true
echo "Testing $tini with: false"
if $tini -vvvv false; then
if $tini -vvv false; then
exit 1
fi

@ -37,7 +37,7 @@
#if HAS_SUBREAPER
static int subreaper = 0;
#endif
static int verbosity = 0;
static int verbosity = 1;
static struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 };
@ -74,7 +74,7 @@ void print_usage(char* const name, FILE* const file) {
#if HAS_SUBREAPER
fprintf(file, " -s: Register as a process subreaper (requires Linux >= 3.4).\n");
#endif
fprintf(file, " -v: Generate more verbose output. Repeat up to 4 times.\n");
fprintf(file, " -v: Generate more verbose output. Repeat up to 3 times.\n");
fprintf(file, "\n");
}

@ -77,7 +77,7 @@ if __name__ == "__main__":
functional_base_cmd = base_cmd + [
"--entrypoint={0}".format(entrypoint),
img,
"-vvvv",
"-vvv",
]
# Reaping test

@ -49,7 +49,7 @@ looks like `tini: invalid option -- 'c'`, then you *need* to add the `--`.
Arguments Tini itself are passed like so: `/tini -v -- /your/program`.
The only supported argument at this time is `-v`, for extra verbosity (you can
pass it up to 4 times, e.g. `-vvvv`).
pass it up to 3 times, e.g. `-vvv`).
*NOTE: The binary linked above is a 64-bit dynamically-linked binary.*
@ -103,12 +103,11 @@ Debugging
---------
If something isn't working just like you expect, consider increasing the
verbosity level (up to 4):
verbosity level (up to 3):
tini -v -- bash -c 'exit 1'
tini -vv -- true
tini -vvv -- pwd
tini -vvvv -- ls
[10]: https://github.com/krallin/tini-images

Loading…
Cancel
Save