[PATCH] util: Improve log out parsing errors
Martin Kletzander
mkletzan at redhat.com
Wed Jan 5 13:33:38 UTC 2022
Obviously s/out/output/ in $SUBJ
On Wed, Jan 05, 2022 at 02:31:37PM +0100, Martin Kletzander wrote:
>Suggested-by: Erik Skultety <eskultet at redhat.com>
>Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>---
> src/util/virlog.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/src/util/virlog.c b/src/util/virlog.c
>index 139dce8d0220..b44ad0ef6c47 100644
>--- a/src/util/virlog.c
>+++ b/src/util/virlog.c
>@@ -1487,21 +1487,21 @@ virLogParseOutput(const char *src)
> if (!(tokens = g_strsplit(src, ":", 0)) ||
> (count = g_strv_length(tokens)) < 2) {
> virReportError(VIR_ERR_INVALID_ARG,
>- _("Malformed format for output '%s'"), src);
>+ _("Malformed format for log output '%s'"), src);
> return NULL;
> }
>
> if (virStrToLong_uip(tokens[0], NULL, 10, &prio) < 0 ||
> (prio < VIR_LOG_DEBUG) || (prio > VIR_LOG_ERROR)) {
> virReportError(VIR_ERR_INVALID_ARG,
>- _("Invalid priority '%s' for output '%s'"),
>+ _("Invalid log priority '%s' for log output '%s'"),
> tokens[0], src);
> return NULL;
> }
>
> if ((dest = virLogDestinationTypeFromString(tokens[1])) < 0) {
> virReportError(VIR_ERR_INVALID_ARG,
>- _("Invalid destination '%s' for output '%s'"),
>+ _("Invalid log destination '%s' for log output '%s'"),
> tokens[1], src);
> return NULL;
> }
>@@ -1511,7 +1511,7 @@ virLogParseOutput(const char *src)
> ((dest == VIR_LOG_TO_FILE ||
> dest == VIR_LOG_TO_SYSLOG) && count != 3)) {
> 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]);
> return NULL;
> }
>--
>2.34.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220105/34f5e336/attachment-0001.sig>
More information about the libvir-list
mailing list