X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=6745680901491f26aeb987d68605131aad8c3604;hb=9584450afaaba1686d2b27b6436743339737a789;hp=34d93dae67c1a2ac4585bb83b0d0bc2a4498c115;hpb=ce30e9e1379022835687aa08b7712e27372e05ec;p=rrdtool.git diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c index 34d93da..6745680 100644 --- a/src/rrd_fetch.c +++ b/src/rrd_fetch.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.4.1 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** @@ -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);