Skip to content

Fix incorrect removal of './' when rrdcached is used #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emjemj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect removal of './' when rrdcached is used #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/datasources/WeatherMapDataSource_rrd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ function wmrrd_read_from_real_rrdtool_aggregate($rrdfile,$cf,$aggregatefn,$start
// rrdcached Support: strip "./" from Data Source
if ($map->daemon)
{
$rrdfile = trim($rrdfile,"^./");
if (substr($rrdfile, 0, 2) == "./")
$rrdfile = substr($rrdfile, 2);
}

// Assemble an array of command args.
Expand Down Expand Up @@ -209,7 +210,8 @@ function wmrrd_read_from_real_rrdtool($rrdfile,$cf,$start,$end,$dsnames, &$data,
// rrdcached Support: strip "./" from Data Source
if ($map->daemon)
{
$rrdfile = trim($rrdfile,"^./");
if (substr($rrdfile, 0, 2) == "./")
$rrdfile = substr($rrdfile, 2);
}

$args[] = "fetch";
Expand Down