From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 24 Mar 2009 14:23:32 +0000 (+0100)
Subject: src/rrd_fetch.c: Use "rrdc_fetch" if daemon is available.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=refs%2Fheads%2Fff%2Frrdc_fetch-fetch;p=rrdtool.git

src/rrd_fetch.c: Use "rrdc_fetch" if daemon is available.

Instead of flushing the file via the connection to the daemon and then
accessing it directly, use the "FETCH" command to access the file via
the RRDCacheD. This removes ambiguities with absolute and relative paths
and makes it possible to read data from files that are not available
locally.
---

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 45c0e7c..9e384b8 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);