Commit 81ee51f0 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

criu --help, Doc/criu.txt: fix -v option description

Current description of -v[vvv] was taken from criu-log.h comments
and describes specific log levels used by pr_* functions. The problem
is -vX includes all previous X-1, X-2... levels. Say, -vvvv description
says "debug only", while in fact it is not "only". Fix accordingly.

Also, removed -v0 description as it is useless. What -v0 in fact does is
it sets the log level to default -- same as if -vXXX is not used.

In addition, change a delimiter between option alternatives from comma
to a vertical bar in criu --help output, to be in line with the rest
of usage output.
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 5a4c1f73
...@@ -106,11 +106,14 @@ OPTIONS ...@@ -106,11 +106,14 @@ OPTIONS
*-o*, *--log-file* 'file':: *-o*, *--log-file* 'file'::
Write logging messages to 'file'. Write logging messages to 'file'.
*-v* 'num':: *-v*['num'|*v*...]::
Set logging level to 'num'. Valid arguments are: Set logging level to 'num'. The higer the level, the more output
* *0* - (silent, error messages only); is produced. Either numeric values or multiple *v* can be used.
* *1* - informative (default); The following levels are available:
* *2* - debug messages. * *-v1*, *-v* - only messages and errors;
* *-v2*, *-vv* - also warnings (default level);
* *-v3*, *-vvv* - also information messages;
* *-v4*, *-vvvv* - lots of debug.
*--log-pid*:: *--log-pid*::
Write separate logging files per each pid. Write separate logging files per each pid.
......
...@@ -440,12 +440,11 @@ usage: ...@@ -440,12 +440,11 @@ usage:
"* Logging:\n" "* Logging:\n"
" -o|--log-file FILE log file name\n" " -o|--log-file FILE log file name\n"
" --log-pid enable per-process logging to separate FILE.pid files\n" " --log-pid enable per-process logging to separate FILE.pid files\n"
" -v[NUM] set logging level:\n" " -v[NUM] set logging level (higher level means more output):\n"
" -v0 - messages regardless of log level\n" " -v1|-v - only errors and messages\n"
" -v1, -v - errors, when we are in trouble\n" " -v2|-vv - also warnings (default level)\n"
" -v2, -vv - warnings (default)\n" " -v3|-vvv - also information messages\n"
" -v3, -vvv - informative, everything is fine\n" " -v4|-vvvv - lots of debug\n"
" -v4, -vvvv - debug only\n"
"\n" "\n"
"* Memory dumping options:\n" "* Memory dumping options:\n"
" --track-mem turn on memory changes tracker in kernel\n" " --track-mem turn on memory changes tracker in kernel\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment