mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-12 07:42:56 +00:00
virsh: Fix debugging
Commit a0b6a36f "fixed" what abfff210 broke (URI precedence), but there was still one more thing missing to fix. When using virsh parameters to setup debugging, those weren't honored, because at the time debugging was initializing, arguments weren't parsed yet. To make ewerything work as expected, we need to initialize the debugging twice, once before debugging (so we can debug option parsing properly) and then again after these options are parsed. As a side effect, this patch also fixes a leak when virsh is ran with multiple '-l' parameters. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> (cherry picked from commit ac43da705f0e7c23dffd87c0705ff01711b88ac0)
This commit is contained in:
parent
87cbaec97d
commit
be1b52e236
@ -2324,10 +2324,9 @@ vshInitDebug(vshControl *ctl)
|
||||
debugEnv = getenv("VIRSH_LOG_FILE");
|
||||
if (debugEnv && *debugEnv) {
|
||||
ctl->logfile = vshStrdup(ctl, debugEnv);
|
||||
vshOpenLogFile(ctl);
|
||||
}
|
||||
}
|
||||
|
||||
vshOpenLogFile(ctl);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2336,6 +2335,10 @@ vshInitDebug(vshControl *ctl)
|
||||
static bool
|
||||
vshInit(vshControl *ctl)
|
||||
{
|
||||
/* Since we have the commandline arguments parsed, we need to
|
||||
* re-initialize all the debugging to make it work properly */
|
||||
vshInitDebug(ctl);
|
||||
|
||||
if (ctl->conn)
|
||||
return false;
|
||||
|
||||
@ -3042,7 +3045,9 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
|
||||
ctl->readonly = true;
|
||||
break;
|
||||
case 'l':
|
||||
vshCloseLogFile(ctl);
|
||||
ctl->logfile = vshStrdup(ctl, optarg);
|
||||
vshOpenLogFile(ctl);
|
||||
break;
|
||||
case 'e':
|
||||
len = strlen(optarg);
|
||||
|
Loading…
x
Reference in New Issue
Block a user