[rrd-developers] [PATCH] rrd_flush.c: Provide a more useful error message.

[Sebastian Harl]

Signed-off-by: Sebastian Harl <sh at tokkee.org>
---
 program/src/rrd_flush.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/program/src/rrd_flush.c b/program/src/rrd_flush.c
index 2d8df3a..1f72e80 100644
--- a/program/src/rrd_flush.c
+++ b/program/src/rrd_flush.c
@@ -90,7 +90,21 @@ int rrd_cmd_flush (int argc, char **argv)
     for (int i = optind; i < argc; i++)
     {
         status = rrdc_flush(argv[i]);
-        if (status) break;
+        if (status)
+        {
+            char *error;
+            int   remaining;
+
+            error     = strdup(rrd_get_error());
+            remaining = argc - optind - 1;
+
+            rrd_set_error("Flushing of file \"%s\" failed: %s. Skipping "
+                    "remaining %i file%s.", argv[i],
+                    ((! error) || (*error == '\0')) ? "unknown error" : error,
+                    remaining, (remaining == 1) ? "" : "s");
+            free(error);
+            break;
+        }
     }
 
     return ((status == 0) ? 0 : -1);
-- 
1.6.2.rc0.61.g5cd12

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.oetiker.ch/pipermail/rrd-developers/attachments/20090307/b701f2c8/attachment.bin