From c1710ca6a05b8e679dde6ff26b560a68bf196485 Mon Sep 17 00:00:00 2001 From: Supriya Kannery Date: Thu, 30 Jun 2011 13:52:32 +0530 Subject: [PATCH] virsh: Make "DEBUG" loglevel the superset Aligning loglevel values of virsh to that of libvirt. "DEBUG"=0 loglevel, when specified through commandline or env variable, should log all the messages. "ERROR=4" should log only error messages. Signed-off-by: Supriya Kannery --- tools/virsh.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 84ef2d5e68..563497e530 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13331,13 +13331,17 @@ vshDebug(vshControl *ctl, int level, const char *format, ...) va_list ap; char *str; - va_start(ap, format); - vshOutputLogFile(ctl, VSH_ERR_DEBUG, format, ap); - va_end(ap); - - if (level > ctl->debug) + /* Aligning log levels to that of libvirt. + * Traces with levels >= user-specified-level + * gets logged into file + */ + if (level < ctl->debug) return; + va_start(ap, format); + vshOutputLogFile(ctl, level, format, ap); + va_end(ap); + va_start(ap, format); if (virVasprintf(&str, format, ap) < 0) { /* Skip debug messages on low memory */