[rrd-developers] [PATCH 4/5] src/rrd_fetch.c: Use `rrdc_fetch' if daemon is available.

Florian Forster rrdtool at nospam.verplant.org
Sat May 23 13:04:27 CEST 2009


From: Florian Forster <octo at leeloo.lan.home.verplant.org>


Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>
---
 src/rrd_fetch.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 23be6e0..4d4e7e3 100644
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -167,14 +167,17 @@ int rrd_fetch(
         return -1;
     }
 
-    status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
-    if (opt_daemon) free (opt_daemon);
-    if (status) return (-1);
-
     cf = argv[optind + 1];
 
-    status = rrd_fetch_r(argv[optind], cf, start, end, step,
-            ds_cnt, ds_namv, data);
+    rrdc_connect (opt_daemon);
+    if (rrdc_is_connected (opt_daemon))
+	    status = rrdc_fetch (argv[optind], cf, start, end, step,
+			    ds_cnt, ds_namv, data);
+
+    else
+	    status = rrd_fetch_r(argv[optind], cf, start, end, step,
+			    ds_cnt, ds_namv, data);
+
     if (status != 0)
         return (-1);
     return (0);
-- 
1.6.2.4



More information about the rrd-developers mailing list