External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Improve log output parsing errors

Browse Source 
Suggested-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2022-01-05 14:05:58 +01:00
parent fd9aa4d17c
commit bfe7cd3d8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virlog.c
View File

@ -1487,21 +1487,21 @@ virLogParseOutput(const char *src)
if (!(tokens = g_strsplit(src, ":", 0)) || if (!(tokens = g_strsplit(src, ":", 0)) ||
(count = g_strv_length(tokens)) < 2) { (count = g_strv_length(tokens)) < 2) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Malformed format for output '%s'"), src); _("Malformed format for log output '%s'"), src);
return NULL; return NULL;
} }
if (virStrToLong_uip(tokens[0], NULL, 10, &prio) < 0 || if (virStrToLong_uip(tokens[0], NULL, 10, &prio) < 0 ||
(prio < VIR_LOG_DEBUG) || (prio > VIR_LOG_ERROR)) { (prio < VIR_LOG_DEBUG) || (prio > VIR_LOG_ERROR)) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Invalid priority '%s' for output '%s'"), _("Invalid log priority '%s' for log output '%s'"),
tokens[0], src); tokens[0], src);
return NULL; return NULL;
} }
if ((dest = virLogDestinationTypeFromString(tokens[1])) < 0) { if ((dest = virLogDestinationTypeFromString(tokens[1])) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Invalid destination '%s' for output '%s'"), _("Invalid log destination '%s' for log output '%s'"),
tokens[1], src); tokens[1], src);
return NULL; return NULL;
} }
@ -1511,7 +1511,7 @@ virLogParseOutput(const char *src)
((dest == VIR_LOG_TO_FILE || ((dest == VIR_LOG_TO_FILE ||
dest == VIR_LOG_TO_SYSLOG) && count != 3)) { dest == VIR_LOG_TO_SYSLOG) && count != 3)) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Output '%s' does not meet the format requirements " _("Log output '%s' does not meet the format requirements "
"for destination type '%s'"), src, tokens[1]); "for destination type '%s'"), src, tokens[1]);
return NULL; return NULL;
} }